Remove coordinator removal from add_coordinator test

Use remove_coordinator_from_metadata test where needed
pull/7338/head
naisila 2023-11-13 10:52:53 +03:00
parent 220433ba5c
commit b3af43b27f
No known key found for this signature in database
GPG Key ID: A824BA9862D73E6D
3 changed files with 8 additions and 38 deletions

View File

@ -203,7 +203,14 @@ DEPS = {
),
"multi_tenant_isolation_nonblocking": TestDeps(
"minimal_schedule",
["multi_data_types"],
["multi_data_types", "remove_coordinator_from_metadata"],
),
"citus_split_shard_columnar_partitioned": TestDeps(
"minimal_schedule",
["remove_coordinator_from_metadata"],
),
"add_coordinator": TestDeps(
"minimal_schedule", ["remove_coordinator_from_metadata"], repeatable=False
),
}

View File

@ -11,13 +11,6 @@ CREATE SCHEMA "Tenant Isolation";
SET search_path to "Tenant Isolation";
CREATE ROLE mx_isolation_role_ent WITH LOGIN;
GRANT ALL ON SCHEMA "Tenant Isolation", public TO mx_isolation_role_ent;
\c - postgres - :master_port
SELECT 1 FROM master_remove_node('localhost', :master_port);
?column?
---------------------------------------------------------------------
1
(1 row)
-- connect with this new role
\c - mx_isolation_role_ent - :master_port
SET search_path to "Tenant Isolation";
@ -1289,27 +1282,3 @@ SELECT public.wait_for_resource_cleanup();
(1 row)
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$);
result
---------------------------------------------------------------------
0
0
0
(3 rows)
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$);
result
---------------------------------------------------------------------
0
0
0
(3 rows)
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);
result
---------------------------------------------------------------------
0
0
0
(3 rows)

View File

@ -16,9 +16,6 @@ SET search_path to "Tenant Isolation";
CREATE ROLE mx_isolation_role_ent WITH LOGIN;
GRANT ALL ON SCHEMA "Tenant Isolation", public TO mx_isolation_role_ent;
\c - postgres - :master_port
SELECT 1 FROM master_remove_node('localhost', :master_port);
-- connect with this new role
\c - mx_isolation_role_ent - :master_port
SET search_path to "Tenant Isolation";
@ -613,6 +610,3 @@ ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placem
-- make sure we don't have any replication objects leftover on the nodes
SELECT public.wait_for_resource_cleanup();
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$);
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$);
SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);