From ddd4e3131f4261314107f3ef3d506fca0e15a7b1 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Tue, 29 Nov 2022 14:59:32 +0900 Subject: [PATCH] Update PostgreSQL version of sample scripts --- src/sample/scripts/failover.sh.sample | 2 +- src/sample/scripts/follow_primary.sh.sample | 2 +- src/sample/scripts/pgpool_remote_start.sample | 2 +- src/sample/scripts/recovery_1st_stage.sample | 6 +++--- .../scripts/replication_mode_recovery_1st_stage.sample | 6 +++--- .../scripts/replication_mode_recovery_2nd_stage.sample | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/sample/scripts/failover.sh.sample b/src/sample/scripts/failover.sh.sample index b35c43487..47610fcd3 100755 --- a/src/sample/scripts/failover.sh.sample +++ b/src/sample/scripts/failover.sh.sample @@ -31,7 +31,7 @@ NEW_MAIN_NODE_PGDATA="${10}" OLD_PRIMARY_NODE_HOST="${11}" OLD_PRIMARY_NODE_PORT="${12}" -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 REPL_SLOT_NAME=${FAILED_NODE_HOST//[-.]/_} POSTGRESQL_STARTUP_USER=postgres SSH_KEY_FILE=id_rsa_pgpool diff --git a/src/sample/scripts/follow_primary.sh.sample b/src/sample/scripts/follow_primary.sh.sample index 1c022e6d5..3edaf372a 100755 --- a/src/sample/scripts/follow_primary.sh.sample +++ b/src/sample/scripts/follow_primary.sh.sample @@ -30,7 +30,7 @@ OLD_PRIMARY_NODE_ID="$8" NEW_PRIMARY_NODE_PORT="$9" NEW_PRIMARY_NODE_PGDATA="${10}" -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 ARCHIVEDIR=/var/lib/pgsql/archivedir REPLUSER=repl PCP_USER=pgpool diff --git a/src/sample/scripts/pgpool_remote_start.sample b/src/sample/scripts/pgpool_remote_start.sample index 1ef29dd84..6119e3e8a 100755 --- a/src/sample/scripts/pgpool_remote_start.sample +++ b/src/sample/scripts/pgpool_remote_start.sample @@ -6,7 +6,7 @@ set -o xtrace DEST_NODE_HOST="$1" DEST_NODE_PGDATA="$2" -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 POSTGRESQL_STARTUP_USER=postgres SSH_KEY_FILE=id_rsa_pgpool SSH_OPTIONS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/${SSH_KEY_FILE}" diff --git a/src/sample/scripts/recovery_1st_stage.sample b/src/sample/scripts/recovery_1st_stage.sample index 925c7498c..8b299709d 100755 --- a/src/sample/scripts/recovery_1st_stage.sample +++ b/src/sample/scripts/recovery_1st_stage.sample @@ -11,7 +11,7 @@ DEST_NODE_ID="$5" DEST_NODE_PORT="$6" PRIMARY_NODE_HOST="$7" -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 ARCHIVEDIR=/var/lib/pgsql/archivedir REPLUSER=repl REPL_SLOT_NAME=${DEST_NODE_HOST//[-.]/_} @@ -50,8 +50,8 @@ ssh -T ${SSH_OPTIONS} ${POSTGRESQL_STARTUP_USER}@$DEST_NODE_HOST " set -o errexit - rm -rf $DEST_NODE_PGDATA - rm -rf $ARCHIVEDIR/* + [ -d \"${DEST_NODE_PGDATA}\" ] && rm -rf ${DEST_NODE_PGDATA} + [ -d \"${ARCHIVEDIR}\" ] && rm -rf ${ARCHIVEDIR}/* ${PGHOME}/bin/pg_basebackup -h $PRIMARY_NODE_HOST -U $REPLUSER -p $PRIMARY_NODE_PORT -D $DEST_NODE_PGDATA -X stream diff --git a/src/sample/scripts/replication_mode_recovery_1st_stage.sample b/src/sample/scripts/replication_mode_recovery_1st_stage.sample index bdd582f8a..9d6addbd8 100755 --- a/src/sample/scripts/replication_mode_recovery_1st_stage.sample +++ b/src/sample/scripts/replication_mode_recovery_1st_stage.sample @@ -11,7 +11,7 @@ DEST_NODE_ID="$5" DEST_NODE_PORT="$6" MAIN_NODE_HOST="$7" -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 ARCHIVEDIR=/var/lib/pgsql/archivedir REPLUSER=repl MAX_DURATION=60 @@ -42,8 +42,8 @@ ssh -T ${SSH_OPTIONS} ${POSTGRESQL_STARTUP_USER}@${DEST_NODE_HOST} " set -o errexit - rm -rf $DEST_NODE_PGDATA - rm -rf $ARCHIVEDIR/* + [ -d \"${DEST_NODE_PGDATA}\" ] && rm -rf ${DEST_NODE_PGDATA} + [ -d \"${ARCHIVEDIR}\" ] && rm -rf ${ARCHIVEDIR}/* ${PGHOME}/bin/pg_basebackup -h ${MAIN_NODE_HOST} -U ${REPLUSER} -p ${MAIN_NODE_PORT} -D ${DEST_NODE_PGDATA} -X stream diff --git a/src/sample/scripts/replication_mode_recovery_2nd_stage.sample b/src/sample/scripts/replication_mode_recovery_2nd_stage.sample index ac95f9e34..1db6ad88c 100755 --- a/src/sample/scripts/replication_mode_recovery_2nd_stage.sample +++ b/src/sample/scripts/replication_mode_recovery_2nd_stage.sample @@ -8,7 +8,7 @@ DEST_NODE_HOST="$2" # hostname of the DB node to be recovered DEST_NODE_PGDATA="$3" # database cluster of the DB node to be recovered MAIN_NODE_PORT="$4" # PostgreSQL port number -PGHOME=/usr/pgsql-14 +PGHOME=/usr/pgsql-15 ARCHIVEDIR=/var/lib/pgsql/archivedir # archive log directory POSTGRESQL_STARTUP_USER=postgres SSH_KEY_FILE=id_rsa_pgpool -- 2.39.5