Skip to content

Commit 0447b39

Browse files
committed
Fix up HA without cluster
1 parent 8bb1a48 commit 0447b39

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

share/github-backup-utils/ghe-backup-mssql

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ tempdir=$(mktemp -d -t backup-utils-backup-XXXXXX)
5050
ssh_config_file_opt=
5151
opts=
5252

53-
# git server hostnames under cluster
54-
if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
53+
isHA="$(ghe-ssh "$GHE_HOSTNAME" -- "ghe-config cluster.ha" || true)"
54+
55+
# get server hostnames under cluster and HA
56+
if [ "$GHE_BACKUP_STRATEGY" = "cluster" ] || [ "$isHA" = "true" ] ; then
5557
ssh_config_file="$tempdir/ssh_config"
5658
ssh_config_file_opt="-F $ssh_config_file"
5759
opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"

share/github-backup-utils/ghe-restore-mssql

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ fi
4444
tempdir=$(mktemp -d -t backup-utils-backup-XXXXXX)
4545
ssh_config_file_opt=
4646
opts=
47-
# git server hostnames under cluster
48-
if [ "$GHE_BACKUP_STRATEGY" = "cluster" ]; then
47+
48+
isHA="$(ghe-ssh "$GHE_HOSTNAME" -- "ghe-config cluster.ha" || true)"
49+
50+
# get server hostnames under cluster and HA
51+
if [ "$GHE_BACKUP_STRATEGY" = "cluster" ] || [ "$isHA" = "true" ] ; then
4952
ssh_config_file="$tempdir/ssh_config"
5053
ssh_config_file_opt="-F $ssh_config_file"
5154
opts="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"

0 commit comments

Comments
 (0)