From f584ecc1aa690c08972187c13c907ba8fa556524 Mon Sep 17 00:00:00 2001
From: ivyazmitinov <ivanvyazmitinov@gmail.com>
Date: Wed, 19 Jun 2024 15:02:52 +0200
Subject: [PATCH] Fix flaky test and checkstyle

---
 src/backend/distributed/utils/maintenanced.c  |  1 +
 .../multi_maintenance_multiple_databases.out  | 36 ++++++++++---------
 .../multi_maintenance_multiple_databases.sql  | 14 ++++----
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/backend/distributed/utils/maintenanced.c b/src/backend/distributed/utils/maintenanced.c
index 54a8db6c3..cc808eb89 100644
--- a/src/backend/distributed/utils/maintenanced.c
+++ b/src/backend/distributed/utils/maintenanced.c
@@ -1068,6 +1068,7 @@ MaintenanceDaemonShmemExit(int code, Datum arg)
 	MaintenanceDaemonDBData *myDbData = (MaintenanceDaemonDBData *)
 										hash_search(MaintenanceDaemonDBHash, &databaseOid,
 													HASH_REMOVE, NULL);
+
 	/* Workaround for -Werror=unused-variable */
 	(void) myDbData;
 	Assert(myDbData->workerPid == MyProcPid);
diff --git a/src/test/regress/expected/multi_maintenance_multiple_databases.out b/src/test/regress/expected/multi_maintenance_multiple_databases.out
index 6c5a4c4d3..1b0a65046 100644
--- a/src/test/regress/expected/multi_maintenance_multiple_databases.out
+++ b/src/test/regress/expected/multi_maintenance_multiple_databases.out
@@ -373,11 +373,6 @@ $$;
 -- Cleanup
 \c - - - :master_port
 SELECT $definition$
-       ALTER SYSTEM RESET citus.recover_2pc_interval;
-       ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
-       ALTER SYSTEM RESET citus.max_maintenance_shared_pool_size;
-       SELECT pg_reload_conf();
-
        DO
        $do$
        DECLARE
@@ -499,45 +494,52 @@ SELECT $definition$
        DROP DATABASE db98 WITH (FORCE);
        DROP DATABASE db99 WITH (FORCE);
        DROP DATABASE db100 WITH (FORCE);
-       SELECT count(*)
+
+       SELECT count(*) = 0 as all_databases_dropped
        FROM pg_database
        WHERE datname LIKE 'db%';
+
+       ALTER SYSTEM RESET citus.recover_2pc_interval;
+       ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
+       ALTER SYSTEM RESET citus.max_maintenance_shared_pool_size;
+       SELECT pg_reload_conf();
+
        $definition$ AS cleanup
 \gset
 :cleanup
- pg_reload_conf
+ all_databases_dropped
 ---------------------------------------------------------------------
  t
 (1 row)
 
- count
+ pg_reload_conf
 ---------------------------------------------------------------------
-     0
+ t
 (1 row)
 
 \c - - - :worker_1_port
 :cleanup
- pg_reload_conf
+ all_databases_dropped
 ---------------------------------------------------------------------
  t
 (1 row)
 
- count
+ pg_reload_conf
 ---------------------------------------------------------------------
-     0
+ t
 (1 row)
 
 \c - - - :worker_2_port
 :cleanup
+ all_databases_dropped
+---------------------------------------------------------------------
+ t
+(1 row)
+
  pg_reload_conf
 ---------------------------------------------------------------------
  t
 (1 row)
 
- count
----------------------------------------------------------------------
-     0
-(1 row)
-
 \c - - - :master_port
 DROP EXTENSION IF EXISTS dblink;
diff --git a/src/test/regress/sql/multi_maintenance_multiple_databases.sql b/src/test/regress/sql/multi_maintenance_multiple_databases.sql
index bfcf6d788..7b27c755d 100644
--- a/src/test/regress/sql/multi_maintenance_multiple_databases.sql
+++ b/src/test/regress/sql/multi_maintenance_multiple_databases.sql
@@ -326,11 +326,6 @@ $$;
 \c - - - :master_port
 
 SELECT $definition$
-       ALTER SYSTEM RESET citus.recover_2pc_interval;
-       ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
-       ALTER SYSTEM RESET citus.max_maintenance_shared_pool_size;
-       SELECT pg_reload_conf();
-
        DO
        $do$
        DECLARE
@@ -452,9 +447,16 @@ SELECT $definition$
        DROP DATABASE db98 WITH (FORCE);
        DROP DATABASE db99 WITH (FORCE);
        DROP DATABASE db100 WITH (FORCE);
-       SELECT count(*)
+
+       SELECT count(*) = 0 as all_databases_dropped
        FROM pg_database
        WHERE datname LIKE 'db%';
+
+       ALTER SYSTEM RESET citus.recover_2pc_interval;
+       ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
+       ALTER SYSTEM RESET citus.max_maintenance_shared_pool_size;
+       SELECT pg_reload_conf();
+
        $definition$ AS cleanup
 \gset