Merge pull request #185 from github/ashishkeshan/add-wait-for-ha-proxy

Author: ashishkeshan

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

@@ -32,6 +32,11 @@ snapshot_dir="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
 if is_external_database_snapshot; then
   if [ -n "$EXTERNAL_DATABASE_RESTORE_SCRIPT" ]; then
     $EXTERNAL_DATABASE_RESTORE_SCRIPT
+    # ensure that haproxy and mysql are ready to accept connections before continuing
+    if ! ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-service-wait-mysql"; then
+      error_message "Failed to connect to MySQL service!"
+      exit 2
+    fi
     bm_end "$(basename $0)"
     exit 0
   else

test/bin/ghe-es-snapshot

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Usage: ghe-es-snapshot
-# Emulates the remote GitHub ghe-service-ensure-mysql command. Tests use this
+# Emulates the remote GitHub ghe-service-es-mysql command. Tests use this
 # to assert that the command was executed.
 set -e
 echo "ghe-es-snapshot OK"

test/bin/ghe-service-wait-mysql

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Usage: ghe-service-wait-mysql
+# Emulates the remote GitHub ghe-service-wait-mysql command. Tests use this
+# to assert that the command was executed.
+set -e
+echo "ghe-service-wait-mysql OK"