@@ -38,11 +38,16 @@ is_binary_backup_feature_on(){
38
38
ghe-ssh " $GHE_HOSTNAME " ghe-config --true " mysql.backup.binary"
39
39
}
40
40
41
- if ghe-ssh " $GHE_HOSTNAME " test -f /etc/github/cluster ; then
41
+ ssh_config_file_opt=" "
42
+ if $CLUSTER ; then
42
43
ghe_mysql_master=$( ghe-ssh " $GHE_HOSTNAME " ghe-config " cluster.mysql-master" )
43
44
if [ -z $ghe_mysql_master ]; then
44
45
ghe_mysql_master=$GHE_HOSTNAME
45
46
else
47
+ ssh_config_file=" $tempdir /ssh_config"
48
+ ssh_config_file_opt=" -F $ssh_config_file "
49
+ opts=" $opts -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o PasswordAuthentication=no"
50
+ ghe-ssh-config " $GHE_HOSTNAME " " $ghe_mysql_master " > " $ssh_config_file "
46
51
port=$( ssh_port_part " $GHE_HOSTNAME " )
47
52
ghe_mysql_master=$ghe_mysql_master ${port: +: $port }
48
53
fi
79
84
fi
80
85
81
86
cleanup () {
82
- ghe-ssh " $GHE_RESTORE_HOST " -- " sudo rm -rf $GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz"
87
+ ghe-ssh $ssh_config_file_opt " $GHE_RESTORE_HOST " -- " sudo rm -rf $GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz"
83
88
}
84
89
trap ' cleanup' INT TERM EXIT
85
90
86
- ghe-ssh " $GHE_RESTORE_HOST " -- " sudo mkdir -p '$GHE_REMOTE_DATA_USER_DIR /tmp'" 1>&3
91
+ ghe-ssh $ssh_config_file_opt " $GHE_RESTORE_HOST " -- " sudo mkdir -p '$GHE_REMOTE_DATA_USER_DIR /tmp'" 1>&3
87
92
88
93
# Transfer MySQL data from the snapshot to the GitHub instance.
89
- cat $snapshot_dir /mysql.sql.gz | ghe-ssh " $GHE_RESTORE_HOST " -- " sudo dd of=$GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz >/dev/null 2>&1"
94
+ cat $snapshot_dir /mysql.sql.gz | ghe-ssh $ssh_config_file_opt " $GHE_RESTORE_HOST " -- " sudo dd of=$GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz >/dev/null 2>&1"
90
95
91
96
# Import the database
92
- echo " cat $GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz | $IMPORT_MYSQL " | ghe-ssh " $GHE_RESTORE_HOST " -- /bin/bash 1>&3
97
+ echo " cat $GHE_REMOTE_DATA_USER_DIR /tmp/mysql.sql.gz | $IMPORT_MYSQL " | ghe-ssh $ssh_config_file_opt " $GHE_RESTORE_HOST " -- /bin/bash 1>&3
93
98
94
99
bm_end " $( basename $0 ) "
0 commit comments