Merge pull request #5537 from citusdata/turn_metadata_sync_on_in_mx_regular_user

Turn metadata sync on in mx_regular_user and remove_coordinator

src/test/regress/expected/mx_regular_user.out

@@ -7,19 +7,6 @@ SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
         1
 (1 row)
 
--- sync the metadata to both nodes
-SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
- start_metadata_sync_to_node
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
- start_metadata_sync_to_node
----------------------------------------------------------------------
-
-(1 row)
-
 -- create a role and give access one each node separately
 -- and increase the error level to prevent enterprise to diverge
 SET client_min_messages TO ERROR;
@@ -688,6 +675,19 @@ NOTICE:  dropping metadata on the node (localhost,57638)
 
 (1 row)
 
+-- finally sync metadata again so it doesn't break later tests
+SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
+ start_metadata_sync_to_node
+---------------------------------------------------------------------
+
+(1 row)
+
+SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
+ start_metadata_sync_to_node
+---------------------------------------------------------------------
+
+(1 row)
+
 DROP SCHEMA "Mx Regular User" CASCADE;
 NOTICE:  drop cascades to 10 other objects
 DETAIL:  drop cascades to table "Mx Regular User".partitioned_table

src/test/regress/multi_1_schedule

@@ -299,11 +299,8 @@ test: undistribute_table_cascade
 test: create_citus_local_table_cascade
 test: fkeys_between_local_ref
 test: auto_undist_citus_local
-test: check_mx
-test: turn_mx_off
 test: mx_regular_user
 test: remove_coordinator
-test: turn_mx_on
 
 # ----------
 # multi_transactional_drop_shards tests for dropping shards using connection API

src/test/regress/sql/mx_regular_user.sql

@@ -3,9 +3,6 @@ SET search_path TO "Mx Regular User";
 
 -- add coordinator in idempotent way
 SELECT 1 FROM master_add_node('localhost', :master_port, groupid => 0);
--- sync the metadata to both nodes
-SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
-SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
 
 -- create a role and give access one each node separately
 -- and increase the error level to prevent enterprise to diverge
@@ -355,4 +352,8 @@ SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
 SELECT stop_metadata_sync_to_node('localhost', :worker_1_port);
 SELECT stop_metadata_sync_to_node('localhost', :worker_2_port);
 
+-- finally sync metadata again so it doesn't break later tests
+SELECT start_metadata_sync_to_node('localhost', :worker_1_port);
+SELECT start_metadata_sync_to_node('localhost', :worker_2_port);
+
 DROP SCHEMA "Mx Regular User" CASCADE;