diff --git a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out index 01e3bb88e..a16aefb75 100644 --- a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out +++ b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out @@ -497,20 +497,26 @@ SET citus.override_table_visibility TO false; Schema | Name | Type | Owner --------------------------------------------------------------------- Tenant Isolation | lineitem_streaming | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230000 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230010 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230011 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230012 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230034 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230035 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230036 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230040 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230041 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230002 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230013 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230014 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230015 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230037 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230038 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230039 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230042 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230043 | table | mx_isolation_role_ent -(14 rows) +(20 rows) \c - postgres - :worker_1_port SET search_path to "Tenant Isolation"; @@ -734,25 +740,33 @@ SET citus.override_table_visibility TO false; Schema | Name | Type | Owner --------------------------------------------------------------------- Tenant Isolation | lineitem_streaming | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230000 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230010 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230011 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230012 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230034 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230035 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230036 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230040 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230041 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230002 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230013 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230014 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230015 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230037 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230038 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230039 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230042 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230043 | table | mx_isolation_role_ent -(14 rows) +(20 rows) \c - mx_isolation_role_ent - :master_port SET search_path to "Tenant Isolation"; \set VERBOSITY terse SELECT isolate_tenant_to_new_shard('orders_streaming', 104, 'CASCADE', shard_transfer_mode => 'force_logical'); +WARNING: command DROP TABLE is disabled +WARNING: Failed to drop 1 cleanup shards out of 1 ERROR: command CREATE TABLE is disabled \set VERBOSITY default \c - postgres - :worker_1_port @@ -763,20 +777,26 @@ SET citus.override_table_visibility TO false; Schema | Name | Type | Owner --------------------------------------------------------------------- Tenant Isolation | lineitem_streaming | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230000 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230010 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230011 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230012 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230034 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230035 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230036 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230040 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230041 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230002 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230013 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230014 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230015 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230037 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230038 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230039 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230042 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230043 | table | mx_isolation_role_ent -(14 rows) +(20 rows) DROP EVENT TRIGGER abort_ddl; -- create a trigger for drops @@ -796,12 +816,6 @@ CREATE EVENT TRIGGER abort_drop ON sql_drop SET search_path to "Tenant Isolation"; \set VERBOSITY terse SELECT isolate_tenant_to_new_shard('orders_streaming', 104, 'CASCADE', shard_transfer_mode => 'force_logical'); -WARNING: command DROP TABLE is disabled -WARNING: command DROP TABLE is disabled -WARNING: command DROP TABLE is disabled -WARNING: command DROP TABLE is disabled -WARNING: command DROP TABLE is disabled -WARNING: command DROP TABLE is disabled ERROR: command DROP SUBSCRIPTION is disabled \set VERBOSITY default -- check if metadata is changed @@ -845,8 +859,11 @@ SET citus.override_table_visibility TO false; Schema | Name | Type | Owner --------------------------------------------------------------------- Tenant Isolation | lineitem_streaming | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230000 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230010 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230011 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230012 | table | mx_isolation_role_ent + Tenant Isolation | lineitem_streaming_1230034 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230035 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230036 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230040 | table | mx_isolation_role_ent @@ -855,8 +872,11 @@ SET citus.override_table_visibility TO false; Tenant Isolation | lineitem_streaming_1230057 | table | mx_isolation_role_ent Tenant Isolation | lineitem_streaming_1230058 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230002 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230013 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230014 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230015 | table | mx_isolation_role_ent + Tenant Isolation | orders_streaming_1230037 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230038 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230039 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230042 | table | mx_isolation_role_ent @@ -864,7 +884,7 @@ SET citus.override_table_visibility TO false; Tenant Isolation | orders_streaming_1230059 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230060 | table | mx_isolation_role_ent Tenant Isolation | orders_streaming_1230061 | table | mx_isolation_role_ent -(20 rows) +(26 rows) \c - postgres - :worker_1_port DROP EVENT TRIGGER abort_drop; @@ -1109,6 +1129,7 @@ ORDER BY 1, 2; relname | Constraint | Definition --------------------------------------------------------------------- test_colocated_table_1 | test_colocated_table_1_id_fkey | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1(id) + test_colocated_table_1_1230067 | test_colocated_table_1_id_fkey_1230067 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230067(id) test_colocated_table_1_1230069 | test_colocated_table_1_id_fkey_1230069 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230069(id) test_colocated_table_1_1230071 | test_colocated_table_1_id_fkey_1230071 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230071(id) test_colocated_table_1_1230073 | test_colocated_table_1_id_fkey_1230073 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230073(id) @@ -1117,6 +1138,8 @@ ORDER BY 1, 2; test_colocated_table_1_1230101 | test_colocated_table_1_id_fkey_1230101 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230101(id) test_colocated_table_2 | test_colocated_table_2_id_fkey | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1(id) test_colocated_table_2 | test_colocated_table_2_value_1_fkey | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey(id) + test_colocated_table_2_1230075 | test_colocated_table_2_id_fkey_1230075 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230067(id) + test_colocated_table_2_1230075 | test_colocated_table_2_value_1_fkey_1230075 | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey_1230066(id) test_colocated_table_2_1230077 | test_colocated_table_2_id_fkey_1230077 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230069(id) test_colocated_table_2_1230077 | test_colocated_table_2_value_1_fkey_1230077 | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey_1230066(id) test_colocated_table_2_1230079 | test_colocated_table_2_id_fkey_1230079 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230071(id) @@ -1132,6 +1155,9 @@ ORDER BY 1, 2; test_colocated_table_3 | test_colocated_table_3_id_fkey | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1(id) test_colocated_table_3 | test_colocated_table_3_id_fkey1 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_2(id) test_colocated_table_3 | test_colocated_table_3_value_1_fkey | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey(id) + test_colocated_table_3_1230083 | test_colocated_table_3_id_fkey1_1230083 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_2_1230075(id) + test_colocated_table_3_1230083 | test_colocated_table_3_id_fkey_1230083 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230067(id) + test_colocated_table_3_1230083 | test_colocated_table_3_value_1_fkey_1230083 | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey_1230066(id) test_colocated_table_3_1230085 | test_colocated_table_3_id_fkey1_1230085 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_2_1230077(id) test_colocated_table_3_1230085 | test_colocated_table_3_id_fkey_1230085 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230069(id) test_colocated_table_3_1230085 | test_colocated_table_3_value_1_fkey_1230085 | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey_1230066(id) @@ -1150,7 +1176,7 @@ ORDER BY 1, 2; test_colocated_table_3_1230107 | test_colocated_table_3_id_fkey1_1230107 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_2_1230104(id) test_colocated_table_3_1230107 | test_colocated_table_3_id_fkey_1230107 | FOREIGN KEY (id) REFERENCES "Tenant Isolation".test_colocated_table_1_1230101(id) test_colocated_table_3_1230107 | test_colocated_table_3_value_1_fkey_1230107 | FOREIGN KEY (value_1) REFERENCES "Tenant Isolation".test_reference_table_fkey_1230066(id) -(42 rows) +(48 rows) \c - mx_isolation_role_ent - :master_port SET search_path to "Tenant Isolation"; @@ -1300,4 +1326,4 @@ SELECT count(*) FROM pg_catalog.pg_dist_partition WHERE colocationid > 0; TRUNCATE TABLE pg_catalog.pg_dist_colocation; ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 100; -ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placement_id; +ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placement_id; \ No newline at end of file diff --git a/src/test/regress/sql/multi_tenant_isolation.sql b/src/test/regress/sql/multi_tenant_isolation.sql index 3b4dd6b75..55caf60a1 100644 --- a/src/test/regress/sql/multi_tenant_isolation.sql +++ b/src/test/regress/sql/multi_tenant_isolation.sql @@ -393,6 +393,10 @@ RESET citus.enable_metadata_sync; CREATE EVENT TRIGGER abort_drop ON sql_drop EXECUTE PROCEDURE abort_drop_command(); +\c :master_port +-- Disable deferred drop otherwise we will skip the drop and operation will succeed instead of failing. +ALTER SYSTEM SET citus.defer_drop_after_shard_split TO false; +SELECT pg_reload_conf(); \c - mx_isolation_role_ent - :master_port SET search_path to "Tenant Isolation";