pgpool2.git / summary / log / commit / refs

commit    cdf2873f16176eebe72536a90d56387abb290280
Author:   Tatsuo Ishii <ishii@sraoss.co.jp>
Date:     Tue Feb 09 06:12:02 2021 +0000

    Fix follow_primary creation in pgpool_setup.
    
    Since PostgreSQL 13 it is possible to reload the change of
    recovery_conninfo, but it is not possible to reload
    recovery_command. To fix this use pg_ctl restart regardless the
    version of PostgreSQL.
    
    Also fix an oversight: forgot to create standby.signal.


 src/test/pgpool_setup.in | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/test/pgpool_setup.in b/src/test/pgpool_setup.in
index 36cb177d8..67db63fa1 100644
--- a/src/test/pgpool_setup.in
+++ b/src/test/pgpool_setup.in
@@ -260,17 +260,14 @@ else
    sed -i "/restore_command/s/data[0-9]/`basename $new_primary_db_cluster`/" $db_cluster/myrecovery.conf
 fi
 
+touch $db_cluster/standby.signal
+
 # Skip the target standby node if it's not running
 $pg_ctl -D $db_cluster status >/dev/null 2>&1
 if [ $? = 0 ]
 then
-    if [ $pgversion -ge 130 ];then
-       echo "reload the target server" >> $log
-       $pg_ctl -m f -D $db_cluster reload >> $log 2>&1
-    else
-	echo "restart the target server" >> $log
-	$pg_ctl -w -m f -D $db_cluster restart >> $log 2>&1
-    fi
+    echo "restart the target server" >> $log
+    $pg_ctl -w -m f -D $db_cluster restart >> $log 2>&1
     # attach the node
     pcp_attach_node -w -h localhost -p $PCP_PORT -n $node_id >> $log 2>&1
 else


[parent: 567b102fdace]