From: Tatsuo Ishii <ishii@sraoss.co.jp>
Date: Fri, 7 Aug 2020 00:21:34 +0000 (+0900)
Subject: Fix oversight in previous commit for pgpool_setup.
X-Git-Tag: V4_0_10~17
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=3d2f75f5abfb61eaacd9ada7d8b3d5a7efe52e19;p=pgpool2.git

Fix oversight in previous commit for pgpool_setup.

Commit:
https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commit;h=de133ec848850dac516d805bfbc18873e1a53543

left standby.signal in the recovery target node in case when pg_rewind
is used.  As a result, the standby node became primary after
restart.
---

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 50c236d5e..4f6f08175 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -423,9 +423,6 @@ EOF
 fi
 
 cat >> $1/$SCRIPT <<'EOF'
-touch standby.signal
-touch $DEST_CLUSTER/standby.signal
-
 if [ $pg_rewind_failed = "true" ];then
 
 $psql -p $PORT -c "SELECT pg_start_backup('Streaming Replication', true)" postgres
@@ -447,7 +444,6 @@ mkdir $DEST_CLUSTER/pg_wal
 chmod 700 $DEST_CLUSTER/pg_wal
 
 rm $DEST_CLUSTER/recovery.done
-rm standby.signal
 fi
 EOF
 
@@ -494,6 +490,7 @@ fi
 if [ $pg_rewind_failed = "false" ];then
     cp /tmp/postgresql.conf $DEST_CLUSTER/
 fi
+touch $DEST_CLUSTER/standby.signal
 EOF
 
 #-------------------------------------------