diff --git a/src/test/regress/enterprise_isolation_schedule b/src/test/regress/enterprise_isolation_schedule index 689a7db75..ae22dac84 100644 --- a/src/test/regress/enterprise_isolation_schedule +++ b/src/test/regress/enterprise_isolation_schedule @@ -3,6 +3,7 @@ test: isolation_setup # tests that change node metadata should precede # isolation_cluster_management such that tests # that come later can be parallelized +test: enable_ddl_propagation test: isolation_cluster_management test: isolation_move_placement_vs_move_placement diff --git a/src/test/regress/expected/enable_ddl_propagation.out b/src/test/regress/expected/enable_ddl_propagation.out new file mode 100644 index 000000000..eb990e11d --- /dev/null +++ b/src/test/regress/expected/enable_ddl_propagation.out @@ -0,0 +1,19 @@ +--------------------------------------------------------------------- + t +(1 row) + +\c - - - :worker_1_port +ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; +SELECT pg_reload_conf(); + pg_reload_conf +--------------------------------------------------------------------- + t +(1 row) + +\c - - - :worker_2_port +ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; +SELECT pg_reload_conf(); + pg_reload_conf +--------------------------------------------------------------------- + t +(1 row) diff --git a/src/test/regress/expected/multi_test_helpers.out b/src/test/regress/expected/multi_test_helpers.out index 36b1be250..0f31f2354 100644 --- a/src/test/regress/expected/multi_test_helpers.out +++ b/src/test/regress/expected/multi_test_helpers.out @@ -1,28 +1,4 @@ -- File to create functions and helpers needed for subsequent tests -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - pg_reload_conf ---------------------------------------------------------------------- - t -(1 row) - -\c - - - :master_port -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$ diff --git a/src/test/regress/failure_schedule b/src/test/regress/failure_schedule index 8b992422e..f308fd7d2 100644 --- a/src/test/regress/failure_schedule +++ b/src/test/regress/failure_schedule @@ -1,4 +1,5 @@ # import this file (from psql you can use \i) to use mitmproxy manually +test: enable_ddl_propagation test: failure_test_helpers # this should only be run by pg_regress_multi, you don't need it diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 868d78cdf..aa742096d 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -64,6 +64,7 @@ test: alter_database_propagation test: citus_shards test: reassign_owned test: alter_database_from_nonmain_db +test: enable_ddl_propagation # ---------- # multi_citus_tools tests utility functions written for citus tools diff --git a/src/test/regress/sql/enable_ddl_propagation.sql b/src/test/regress/sql/enable_ddl_propagation.sql new file mode 100644 index 000000000..b859d8a28 --- /dev/null +++ b/src/test/regress/sql/enable_ddl_propagation.sql @@ -0,0 +1,11 @@ +ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; +SELECT pg_reload_conf(); + +\c - - - :worker_1_port +ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; +SELECT pg_reload_conf(); + +\c - - - :worker_2_port +ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; +SELECT pg_reload_conf(); + diff --git a/src/test/regress/sql/multi_test_helpers.sql b/src/test/regress/sql/multi_test_helpers.sql index 350240494..7d218361c 100644 --- a/src/test/regress/sql/multi_test_helpers.sql +++ b/src/test/regress/sql/multi_test_helpers.sql @@ -1,15 +1,5 @@ -- File to create functions and helpers needed for subsequent tests -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); -\c - - - :worker_1_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); - -\c - - - :worker_2_port -ALTER SYSTEM SET citus.enable_ddl_propagation = 'true'; -SELECT pg_reload_conf(); -\c - - - :master_port -- create a helper function to create objects on each node CREATE OR REPLACE FUNCTION run_command_on_master_and_workers(p_sql text) RETURNS void LANGUAGE plpgsql AS $$