From d697c9c57c554480bdd05f052c7c45aeccabc4c5 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Fri, 17 Nov 2023 12:46:54 +0900 Subject: [PATCH] Modify the replication slot name conversion in sample scripts to add support for uppercase hostname. Patch in created by Sheikh Wasiu Al Hasib and modified by Be Peng. --- src/sample/scripts/failover.sh.sample | 2 +- src/sample/scripts/follow_primary.sh.sample | 2 +- src/sample/scripts/recovery_1st_stage.sample | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sample/scripts/failover.sh.sample b/src/sample/scripts/failover.sh.sample index 11a8b96f7..bc47b21b7 100755 --- a/src/sample/scripts/failover.sh.sample +++ b/src/sample/scripts/failover.sh.sample @@ -32,7 +32,7 @@ OLD_PRIMARY_NODE_HOST="${11}" OLD_PRIMARY_NODE_PORT="${12}" PGHOME=/usr/pgsql-16 -REPL_SLOT_NAME=${FAILED_NODE_HOST//[-.]/_} +REPL_SLOT_NAME=$(echo ${FAILED_NODE_HOST,,} | tr -- -. _) 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/follow_primary.sh.sample b/src/sample/scripts/follow_primary.sh.sample index 2a04e33cf..de0ae0004 100755 --- a/src/sample/scripts/follow_primary.sh.sample +++ b/src/sample/scripts/follow_primary.sh.sample @@ -36,7 +36,7 @@ REPLUSER=repl PCP_USER=pgpool PGPOOL_PATH=/usr/bin PCP_PORT=9898 -REPL_SLOT_NAME=${NODE_HOST//[-.]/_} +REPL_SLOT_NAME=$(echo ${NODE_HOST,,} | tr -- -. _) 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 a01b73785..7e462d1d8 100755 --- a/src/sample/scripts/recovery_1st_stage.sample +++ b/src/sample/scripts/recovery_1st_stage.sample @@ -14,7 +14,7 @@ PRIMARY_NODE_HOST="$7" PGHOME=/usr/pgsql-16 ARCHIVEDIR=/var/lib/pgsql/archivedir REPLUSER=repl -REPL_SLOT_NAME=${DEST_NODE_HOST//[-.]/_} +REPL_SLOT_NAME=$(echo ${DEST_NODE_HOST,,} | tr -- -. _) POSTGRESQL_STARTUP_USER=postgres SSH_KEY_FILE=id_rsa_pgpool SSH_OPTIONS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ~/.ssh/${SSH_KEY_FILE}" -- 2.39.5