pgpool2.git / summary / log / commit / refs

commit    cbf00a98f04d9d0235e7cbd5d97ba1ec22cadd9d
Author:   Tatsuo Ishii <ishii@sraoss.co.jp>
Date:     Fri Aug 07 00:21:34 2020 +0000

    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.


 src/test/pgpool_setup | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index 5e33225cc..c5b488cc6 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -430,9 +430,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
@@ -454,7 +451,6 @@ mkdir $DEST_CLUSTER/pg_wal
 chmod 700 $DEST_CLUSTER/pg_wal
 
 rm $DEST_CLUSTER/recovery.done
-rm standby.signal
 fi
 EOF
 
@@ -501,6 +497,7 @@ fi
 if [ $pg_rewind_failed = "false" ];then
     cp /tmp/postgresql.conf $DEST_CLUSTER/
 fi
+touch $DEST_CLUSTER/standby.signal
 EOF
 
 #-------------------------------------------


[parent: c7d3ad9fd6f7]