pgpool2.git / summary / log / commit / refs

commit    d847702e8d8998ce5f593a3bcc3cbf948fb98260
Author:   Tatsuo Ishii <ishii@sraoss.co.jp>
Date:     Sat Feb 08 10:39:14 2020 +0000

    Fix oversight to adopt PostgreSQL 12.
    
    From PostgreSQL 12 WAL dir is renamed to "pg_wal". pgpool_setup should
    have dealt with this.


 src/test/pgpool_setup | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/test/pgpool_setup b/src/test/pgpool_setup
index ae50be849..f1da5ea6f 100755
--- a/src/test/pgpool_setup
+++ b/src/test/pgpool_setup
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2013-2019 PgPool Global Development Group
+# Copyright (c) 2013-2020 PgPool Global Development Group
 #
 # Permission to use, copy, modify, and distribute this software and
 # its documentation for any purpose and without fee is hereby
@@ -435,12 +435,17 @@ echo "source: $master_db_cluster dest: $DEST_CLUSTER" >> $log
 rsync -C -a -c --delete --exclude postgresql.conf --exclude postmaster.pid \
 --exclude postmaster.opts --exclude pg_log \
 --exclude recovery.conf --exclude recovery.done \
---exclude pg_xlog \
+--exclude pg_xlog pg_wal \
 $master_db_cluster/ $DEST_CLUSTER/
 
 rm -fr $DEST_CLUSTER/pg_xlog 
 mkdir $DEST_CLUSTER/pg_xlog
 chmod 700 $DEST_CLUSTER/pg_xlog
+
+rm -fr $DEST_CLUSTER/pg_wal 
+mkdir $DEST_CLUSTER/pg_wal
+chmod 700 $DEST_CLUSTER/pg_wal
+
 rm $DEST_CLUSTER/recovery.done standby.signal
 rm standby.signal
 fi
@@ -533,13 +538,17 @@ REOF
 rsync -C -a -c --delete --exclude postgresql.conf --exclude postmaster.pid \
 --exclude postmaster.opts --exclude pg_log \
 --exclude recovery.done \
---exclude pg_xlog \
+--exclude pg_xlog pg_wal \
 $master_db_cluster/ $DEST_CLUSTER/
 
 rm -fr $DEST_CLUSTER/pg_xlog 
 mkdir $DEST_CLUSTER/pg_xlog
 chmod 700 $DEST_CLUSTER/pg_xlog
 
+rm -fr $DEST_CLUSTER/pg_wal
+mkdir $DEST_CLUSTER/pg_wal
+chmod 700 $DEST_CLUSTER/pg_wal
+
 $psql -p $PORT -c "SELECT pg_stop_backup()" postgres
 EOF
 


[parent: 2d390ebb04af]