From 1f68c7c8c54756ea5f230681585833e471f340e2 Mon Sep 17 00:00:00 2001 From: naisila Date: Fri, 10 Nov 2023 15:08:09 +0300 Subject: [PATCH] Fix flaky multi_tenant_isolation_nonblocking --- .../expected/multi_tenant_isolation_nonblocking.out | 7 +++++++ .../regress/sql/multi_tenant_isolation_nonblocking.sql | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out index e52f10885..0ee1b5319 100644 --- a/src/test/regress/expected/multi_tenant_isolation_nonblocking.out +++ b/src/test/regress/expected/multi_tenant_isolation_nonblocking.out @@ -1282,6 +1282,13 @@ 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; +-- make sure we don't have any replication objects leftover on the nodes +SELECT public.wait_for_resource_cleanup(); + wait_for_resource_cleanup +--------------------------------------------------------------------- + +(1 row) + SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$); result --------------------------------------------------------------------- diff --git a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql index 738ca6d12..e209c9271 100644 --- a/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql +++ b/src/test/regress/sql/multi_tenant_isolation_nonblocking.sql @@ -611,6 +611,8 @@ ALTER SEQUENCE pg_catalog.pg_dist_colocationid_seq RESTART 100; ALTER SEQUENCE pg_catalog.pg_dist_placement_placementid_seq RESTART :last_placement_id; +-- make sure we don't have any replication objects leftover on the nodes +SELECT public.wait_for_resource_cleanup(); SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_replication_slots$$); SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_publication$$); SELECT result FROM run_command_on_all_nodes($$SELECT count(*) FROM pg_subscription$$);