From: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Sat, 29 May 2021 08:32:38 +0000 (+0900)
Subject: Enhance watchdog_setup script.
X-Git-Tag: V4_0_15~12
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=ce33dd8b43eebf68e16e8caa937eed98d7861430;p=pgpool2.git

Enhance watchdog_setup script.

shutdownall script generated by watchdog_setup shutdowns in the node
number order i.e.: 0, 1, 2...  This causes PostgreSQL backend shutdown
when pgpool0 node went down and node 1, 2... trigger failover event,
which is not necessary in the whole shutdown sequence.  Shutting down
in the reverse order (...2, 1, 0) should prevent this and shorten the
whole shutdown sequence.

Also this should prevent occasional 018.detach_primary and
028.watchdog_enable_consensus_with_half_votes test timeout (they use
watchdog_setup).
---

diff --git a/src/test/watchdog_setup.in b/src/test/watchdog_setup.in
index f257aab6a..78f7cdf0f 100755
--- a/src/test/watchdog_setup.in
+++ b/src/test/watchdog_setup.in
@@ -321,13 +321,21 @@ do
     echo "cd pgpool$cnt" >> $STARTALL
     echo "./startall" >> $STARTALL
     echo "cd .." >> $STARTALL
-    echo "cd pgpool$cnt" >> $SHUTDOWNALL
-    echo "./shutdownall" >> $SHUTDOWNALL
-    echo "cd .." >> $SHUTDOWNALL
 
     cd ..
     cnt=`expr $cnt + 1`
 done
 
+# shutdown needs to be performed in reverse order because shutdown of
+# PostgreSQL servers must be executed in pgpoo0.
+cnt=$W_NUM_PGPOOL
+while [ $cnt -gt 0 ]
+do
+    cnt=`expr $cnt - 1`
+    echo "cd pgpool$cnt" >> $SHUTDOWNALL
+    echo "./shutdownall" >> $SHUTDOWNALL
+    echo "cd .." >> $SHUTDOWNALL
+done
+
 chmod 755 $STARTALL
 chmod 755 $SHUTDOWNALL