From e95a84a7a5b2a912622c400e6e215de7f8ec7500 Mon Sep 17 00:00:00 2001
From: naisila <nicypp@gmail.com>
Date: Fri, 10 Nov 2023 10:34:42 +0300
Subject: [PATCH] Try to get flaky result

---
 .github/workflows/build_and_test.yml               |  2 +-
 .../citus_non_blocking_split_shard_cleanup.out     | 14 ++------------
 src/test/regress/expected/logical_replication.out  | 14 ++------------
 .../sql/citus_non_blocking_split_shard_cleanup.sql |  4 ++--
 src/test/regress/sql/logical_replication.sql       |  4 ++--
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 6b33c658f..92da5752d 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -486,7 +486,7 @@ jobs:
       image: ${{ needs.params.outputs.fail_test_image_name }}:${{ fromJson(needs.params.outputs.pg16_version).full }}${{ needs.params.outputs.image_suffix }}
       options: --user root
     env:
-      runs: 8
+      runs: 20
     needs:
     - params
     - build
diff --git a/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out b/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
index b2b28c9eb..f25cb7953 100644
--- a/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
+++ b/src/test/regress/expected/citus_non_blocking_split_shard_cleanup.out
@@ -113,18 +113,8 @@ SELECT public.wait_for_resource_cleanup();
 
 (1 row)
 
-SELECT public.wait_for_resource_cleanup();
- wait_for_resource_cleanup
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT public.wait_for_resource_cleanup();
- wait_for_resource_cleanup
----------------------------------------------------------------------
-
-(1 row)
-
+-- try to get flaky result
+SET search_path TO "citus_split_test_schema";
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";
 -- Replication slots should be cleaned up
diff --git a/src/test/regress/expected/logical_replication.out b/src/test/regress/expected/logical_replication.out
index a8a05d1eb..11a3d24ed 100644
--- a/src/test/regress/expected/logical_replication.out
+++ b/src/test/regress/expected/logical_replication.out
@@ -93,18 +93,8 @@ SELECT public.wait_for_resource_cleanup();
 
 (1 row)
 
-SELECT public.wait_for_resource_cleanup();
- wait_for_resource_cleanup
----------------------------------------------------------------------
-
-(1 row)
-
-SELECT public.wait_for_resource_cleanup();
- wait_for_resource_cleanup
----------------------------------------------------------------------
-
-(1 row)
-
+-- try to get flaky result
+SET search_path TO logical_replication;
 -- the subscription is still there, as there is no cleanup record for it
 -- we have created it manually
 SELECT subname from pg_subscription;
diff --git a/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql b/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
index 0cffc6a0e..3d77be874 100644
--- a/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
+++ b/src/test/regress/sql/citus_non_blocking_split_shard_cleanup.sql
@@ -80,8 +80,8 @@ SELECT pg_catalog.citus_split_shard_by_split_points(
     'force_logical');
 
 SELECT public.wait_for_resource_cleanup();
-SELECT public.wait_for_resource_cleanup();
-SELECT public.wait_for_resource_cleanup();
+-- try to get flaky result
+SET search_path TO "citus_split_test_schema";
 
 \c - - - :worker_2_port
 SET search_path TO "citus_split_test_schema";
diff --git a/src/test/regress/sql/logical_replication.sql b/src/test/regress/sql/logical_replication.sql
index 0460d5c90..b2d36db9f 100644
--- a/src/test/regress/sql/logical_replication.sql
+++ b/src/test/regress/sql/logical_replication.sql
@@ -54,8 +54,8 @@ SET search_path TO logical_replication;
 select citus_move_shard_placement(6830002, 'localhost', :worker_1_port, 'localhost', :worker_2_port, 'force_logical');
 
 SELECT public.wait_for_resource_cleanup();
-SELECT public.wait_for_resource_cleanup();
-SELECT public.wait_for_resource_cleanup();
+-- try to get flaky result
+SET search_path TO logical_replication;
 
 -- the subscription is still there, as there is no cleanup record for it
 -- we have created it manually