diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 8b1135812..af21ebb7f 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -493,6 +493,7 @@ SELECT * FROM multi_extension.print_extension_changes(); ALTER EXTENSION citus UPDATE TO '9.5-1'; BEGIN; SELECT master_add_node('localhost', :master_port, groupId=>0); +NOTICE: localhost:xxxxx is the coordinator and already contains metadata, skipping syncing the metadata master_add_node --------------------------------------------------------------------- 1 @@ -1222,6 +1223,9 @@ HINT: You can manually create a database and its extensions on workers. \c - - - :master_port \c another CREATE EXTENSION citus; +\c - - - :worker_1_port +CREATE EXTENSION citus; +\c - - - :master_port SET citus.enable_object_propagation TO off; -- prevent distributed transactions during add node SELECT FROM master_add_node('localhost', :worker_1_port); WARNING: citus.enable_object_propagation is off, not creating distributed objects on worker @@ -1230,7 +1234,6 @@ DETAIL: distributed objects are only kept in sync when citus.enable_object_prop (1 row) \c - - - :worker_1_port -CREATE EXTENSION citus; ALTER FUNCTION assign_distributed_transaction_id(initiator_node_identifier integer, transaction_number bigint, transaction_stamp timestamp with time zone) RENAME TO dummy_assign_function; \c - - - :master_port diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index ab8c8be6f..11e763400 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -15,8 +15,8 @@ # --- # Tests around schema changes, these are run first, so there's no preexisting objects. # --- -test: turn_mx_off test: multi_extension +test: turn_mx_off test: single_node test: single_node_truncate test: turn_mx_on diff --git a/src/test/regress/multi_mx_schedule b/src/test/regress/multi_mx_schedule index cda1c0c53..08828af4b 100644 --- a/src/test/regress/multi_mx_schedule +++ b/src/test/regress/multi_mx_schedule @@ -13,10 +13,8 @@ # --- # Tests around schema changes, these are run first, so there's no preexisting objects. # --- -test: turn_mx_off test: multi_extension test: multi_test_helpers multi_test_helpers_superuser -test: turn_mx_on test: multi_mx_node_metadata test: multi_cluster_management test: multi_mx_function_table_reference diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 01702c793..d237bf5a1 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -634,11 +634,14 @@ CREATE DATABASE another; \c another CREATE EXTENSION citus; +\c - - - :worker_1_port +CREATE EXTENSION citus; +\c - - - :master_port + SET citus.enable_object_propagation TO off; -- prevent distributed transactions during add node SELECT FROM master_add_node('localhost', :worker_1_port); \c - - - :worker_1_port -CREATE EXTENSION citus; ALTER FUNCTION assign_distributed_transaction_id(initiator_node_identifier integer, transaction_number bigint, transaction_stamp timestamp with time zone) RENAME TO dummy_assign_function;