From b82af4db3b45645f084adafaf1f63ef5a3abce24 Mon Sep 17 00:00:00 2001 From: Halil Ozan Akgul Date: Wed, 15 Dec 2021 12:43:26 +0300 Subject: [PATCH] Turn metadata sync on in multi_size_queries, multi_drop_extension and multi_unsupported_worker_operations --- .../multi_unsupported_worker_operations.out | 23 +------------------ src/test/regress/multi_1_schedule | 6 ++--- .../multi_unsupported_worker_operations.sql | 7 ------ 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/test/regress/expected/multi_unsupported_worker_operations.out b/src/test/regress/expected/multi_unsupported_worker_operations.out index 2cb91b719..fc51e202e 100644 --- a/src/test/regress/expected/multi_unsupported_worker_operations.out +++ b/src/test/regress/expected/multi_unsupported_worker_operations.out @@ -45,12 +45,6 @@ ORDER BY logicalrelid; mx_table_2 | s | 150000 (2 rows) -SELECT start_metadata_sync_to_node('localhost', :worker_1_port); - start_metadata_sync_to_node ---------------------------------------------------------------------- - -(1 row) - COPY mx_table (col_1, col_2) FROM STDIN WITH (FORMAT 'csv'); INSERT INTO mx_ref_table VALUES (-37, 'morbi'); INSERT INTO mx_ref_table VALUES (-78, 'sapien'); @@ -232,7 +226,7 @@ HINT: Connect to the coordinator and run it again. SELECT hasmetadata FROM pg_dist_node WHERE nodeport=:worker_2_port; hasmetadata --------------------------------------------------------------------- - f + t (1 row) -- stop_metadata_sync_to_node @@ -351,20 +345,5 @@ HINT: Connect to the coordinator and run it again. \c - - - :master_port DROP TABLE mx_table; DROP TABLE mx_table_2; -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) - -\c - - - :worker_1_port -DELETE FROM pg_dist_node; -SELECT worker_drop_distributed_table(logicalrelid::regclass::text) FROM pg_dist_partition WHERE logicalrelid::text LIKE 'mx\_%table%'; - worker_drop_distributed_table ---------------------------------------------------------------------- -(0 rows) - -\c - - - :master_port ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART :last_colocation_id; RESET citus.shard_replication_factor; diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 906e40329..4cc811a4b 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -220,8 +220,6 @@ test: multi_router_planner_fast_path # ---------- test: multi_large_shardid -test: check_mx -test: turn_mx_off # ---------- # multi_size_queries tests various size commands on distributed tables # ---------- @@ -236,9 +234,11 @@ 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: multi_unsupported_worker_operations test: turn_mx_on +test: multi_unsupported_worker_operations # ---------- # grant_on_schema_propagation tests if the GRANT ... ON SCHEMA queries are propagated correctly diff --git a/src/test/regress/sql/multi_unsupported_worker_operations.sql b/src/test/regress/sql/multi_unsupported_worker_operations.sql index 162268108..b9f4ee337 100644 --- a/src/test/regress/sql/multi_unsupported_worker_operations.sql +++ b/src/test/regress/sql/multi_unsupported_worker_operations.sql @@ -33,8 +33,6 @@ FROM pg_dist_partition WHERE logicalrelid IN ('mx_table'::regclass, 'mx_table_2'::regclass) ORDER BY logicalrelid; -SELECT start_metadata_sync_to_node('localhost', :worker_1_port); - COPY mx_table (col_1, col_2) FROM STDIN WITH (FORMAT 'csv'); -37, 'lorem' 65536, 'ipsum' @@ -219,11 +217,6 @@ DROP SEQUENCE mx_table_col_3_seq CASCADE; \c - - - :master_port DROP TABLE mx_table; DROP TABLE mx_table_2; -SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); -\c - - - :worker_1_port -DELETE FROM pg_dist_node; -SELECT worker_drop_distributed_table(logicalrelid::regclass::text) FROM pg_dist_partition WHERE logicalrelid::text LIKE 'mx\_%table%'; -\c - - - :master_port ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART :last_colocation_id; RESET citus.shard_replication_factor;