From b9c06a6762121792942f144d01776b01b649d9d8 Mon Sep 17 00:00:00 2001 From: Halil Ozan Akgul Date: Wed, 22 Dec 2021 10:57:05 +0300 Subject: [PATCH] Turn metadata sync on in multi_metadata_sync --- .../regress/expected/multi_metadata_sync.out | 31 ++++++++++++++++++- src/test/regress/multi_1_schedule | 3 -- src/test/regress/sql/multi_metadata_sync.sql | 9 ++++++ 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/src/test/regress/expected/multi_metadata_sync.out b/src/test/regress/expected/multi_metadata_sync.out index 970318b7f..6db1c40f2 100644 --- a/src/test/regress/expected/multi_metadata_sync.out +++ b/src/test/regress/expected/multi_metadata_sync.out @@ -3,6 +3,21 @@ -- -- Tests for metadata snapshot functions, metadata syncing functions and propagation of -- metadata changes to MX tables. +-- Turn metadata sync off at first +SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); +NOTICE: dropping metadata on the node (localhost,57637) + stop_metadata_sync_to_node +--------------------------------------------------------------------- + +(1 row) + +SELECT stop_metadata_sync_to_node('localhost', :worker_2_port); +NOTICE: dropping metadata on the node (localhost,57638) + stop_metadata_sync_to_node +--------------------------------------------------------------------- + +(1 row) + ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; SET citus.replicate_reference_tables_on_activate TO off; SELECT nextval('pg_catalog.pg_dist_placement_placementid_seq') AS last_placement_id @@ -1467,13 +1482,14 @@ WHERE logicalrelid='mx_ref'::regclass; (1 row) \c - - - :master_port +SET client_min_messages TO ERROR; SELECT master_add_node('localhost', :worker_2_port); -NOTICE: Replicating reference table "mx_ref" to the node localhost:xxxxx master_add_node --------------------------------------------------------------------- 7 (1 row) +RESET client_min_messages; SELECT shardid, nodename, nodeport FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid='mx_ref'::regclass @@ -1914,3 +1930,16 @@ ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART :last_group_id; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART :last_node_id; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART :last_colocation_id; ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placement_id; +-- Turn metadata sync back on at the end +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) + diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 37537e9dd..25b3db268 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -232,10 +232,7 @@ test: multi_drop_extension # multi_metadata_sync tests the propagation of mx-related metadata changes to metadata workers # multi_unsupported_worker_operations tests that unsupported operations error out on metadata workers # ---------- -test: check_mx -test: turn_mx_off test: multi_metadata_sync -test: turn_mx_on test: multi_unsupported_worker_operations # ---------- diff --git a/src/test/regress/sql/multi_metadata_sync.sql b/src/test/regress/sql/multi_metadata_sync.sql index 440306ea6..f55bc9c3f 100644 --- a/src/test/regress/sql/multi_metadata_sync.sql +++ b/src/test/regress/sql/multi_metadata_sync.sql @@ -5,6 +5,9 @@ -- Tests for metadata snapshot functions, metadata syncing functions and propagation of -- metadata changes to MX tables. +-- Turn metadata sync off at first +SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); +SELECT stop_metadata_sync_to_node('localhost', :worker_2_port); ALTER SEQUENCE pg_catalog.pg_dist_shardid_seq RESTART 1310000; SET citus.replicate_reference_tables_on_activate TO off; @@ -674,7 +677,9 @@ FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement WHERE logicalrelid='mx_ref'::regclass; \c - - - :master_port +SET client_min_messages TO ERROR; SELECT master_add_node('localhost', :worker_2_port); +RESET client_min_messages; SELECT shardid, nodename, nodeport FROM pg_dist_shard NATURAL JOIN pg_dist_shard_placement @@ -859,3 +864,7 @@ ALTER SEQUENCE pg_catalog.pg_dist_groupid_seq RESTART :last_group_id; ALTER SEQUENCE pg_catalog.pg_dist_node_nodeid_seq RESTART :last_node_id; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART :last_colocation_id; ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placement_id; + +-- Turn metadata sync back on at the end +SELECT start_metadata_sync_to_node('localhost', :worker_1_port); +SELECT start_metadata_sync_to_node('localhost', :worker_2_port);