A few minor edits

Author: jianghao0718

backup.config-example

@@ -84,4 +84,4 @@ GHE_NUM_SNAPSHOTS=10
 
 # When running an external mysql database, run this script to trigger a MySQL restore
 # rather than attempting to backup via backup-utils directly.
-#EXTERNAL_DATABASE_RESTORE_SCRIPT="/bin/false"
+#EXTERNAL_DATABASE_RESTORE_SCRIPT="/bin/false"

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

@@ -36,66 +36,70 @@ if is_service_external 'mysql' "$snapshot_dir/settings.json"; then
     echo "Error: EXTERNAL_DATABASE_RESTORE_SCRIPT is not configured. Please configure in backup.config."
     exit 1
   fi
-else
-  ssh_config_file_opt=
-  if is_binary_backup_feature_on; then
-    # Feature "mysql.backup.binary" is on, which means new backup scripts are available
-    if is_binary_backup "$snapshot_dir"; then
-      if $CLUSTER ; then
-        ghe_mysql_master=$(ghe-ssh "$GHE_HOSTNAME" ghe-config "cluster.mysql-master")
-        if [ -z $ghe_mysql_master ]; then
-          echo "Something is wrong with configuration: cluster.mysql-master not found" >&2
-          exit 2
-        else
-          tempdir=$(mktemp -d -t backup-utils-restore-XXXXXX)
-          ssh_config_file="$tempdir/ssh_config"
-          ssh_config_file_opt="-F $ssh_config_file"
-          ghe-ssh-config "$GHE_HOSTNAME" "$ghe_mysql_master" > "$ssh_config_file"
-          port=$(ssh_port_part "$GHE_HOSTNAME")
-          ghe_mysql_master=$ghe_mysql_master${port:+:$port}
-        fi
-      else
-        ghe_mysql_master=$GHE_HOSTNAME
-      fi
+  # Finsh the benchmark and exit early. If the script returns a non-zero 
+  # exit code, it will be caught by`set -e`
+  bm_end "$(basename $0)"
+  exit 0
+fi
 
-      # Check if the decompress needed by looking into the sentinel file
-      # In 2.19.5 we compress the binary backup twice
-      if [ "$(cat $snapshot_dir/mysql-binary-backup-sentinel)" = "NO_ADDITIONAL_COMPRESSION" ]; then
-        IMPORT_MYSQL=ghe-import-mysql-xtrabackup
-        GHE_RESTORE_HOST=$ghe_mysql_master
+ssh_config_file_opt=
+if is_binary_backup_feature_on; then
+  # Feature "mysql.backup.binary" is on, which means new backup scripts are available
+  if is_binary_backup "$snapshot_dir"; then
+    if $CLUSTER ; then
+      ghe_mysql_master=$(ghe-ssh "$GHE_HOSTNAME" ghe-config "cluster.mysql-master")
+      if [ -z $ghe_mysql_master ]; then
+        echo "Something is wrong with configuration: cluster.mysql-master not found" >&2
+        exit 2
       else
-        IMPORT_MYSQL="unpigz | ghe-import-mysql-xtrabackup"
-        GHE_RESTORE_HOST=$ghe_mysql_master
+        tempdir=$(mktemp -d -t backup-utils-restore-XXXXXX)
+        ssh_config_file="$tempdir/ssh_config"
+        ssh_config_file_opt="-F $ssh_config_file"
+        ghe-ssh-config "$GHE_HOSTNAME" "$ghe_mysql_master" > "$ssh_config_file"
+        port=$(ssh_port_part "$GHE_HOSTNAME")
+        ghe_mysql_master=$ghe_mysql_master${port:+:$port}
       fi
     else
-      IMPORT_MYSQL="unpigz | ghe-import-mysql-mysqldump"
-      GHE_RESTORE_HOST=$GHE_HOSTNAME
+      ghe_mysql_master=$GHE_HOSTNAME
     fi
-  else
-    # We do not allow to restore binary backup without "mysql.backup.binary" set
-    if is_binary_backup "$snapshot_dir"; then
-      echo "To restore from a binary backup, you have to set ghe-config \"mysql.backup.binary\" to true" >&2
-      exit 2
+
+    # Check if the decompress needed by looking into the sentinel file
+    # In 2.19.5 we compress the binary backup twice
+    if [ "$(cat $snapshot_dir/mysql-binary-backup-sentinel)" = "NO_ADDITIONAL_COMPRESSION" ]; then
+      IMPORT_MYSQL=ghe-import-mysql-xtrabackup
+      GHE_RESTORE_HOST=$ghe_mysql_master
     else
-      # legacy mode
-      IMPORT_MYSQL="unpigz | ghe-import-mysql"
-      GHE_RESTORE_HOST=$GHE_HOSTNAME
+      IMPORT_MYSQL="unpigz | ghe-import-mysql-xtrabackup"
+      GHE_RESTORE_HOST=$ghe_mysql_master
     fi
+  else
+    IMPORT_MYSQL="unpigz | ghe-import-mysql-mysqldump"
+    GHE_RESTORE_HOST=$GHE_HOSTNAME
+  fi
+else
+  # We do not allow to restore binary backup without "mysql.backup.binary" set
+  if is_binary_backup "$snapshot_dir"; then
+    echo "To restore from a binary backup, you have to set ghe-config \"mysql.backup.binary\" to true" >&2
+    exit 2
+  else
+    # legacy mode
+    IMPORT_MYSQL="unpigz | ghe-import-mysql"
+    GHE_RESTORE_HOST=$GHE_HOSTNAME
   fi
+fi
 
-  cleanup() {
-    ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo rm -rf $GHE_REMOTE_DATA_USER_DIR/tmp/mysql.sql.gz"
-  }
-  trap 'cleanup' INT TERM EXIT
+cleanup() {
+  ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo rm -rf $GHE_REMOTE_DATA_USER_DIR/tmp/mysql.sql.gz"
+}
+trap 'cleanup' INT TERM EXIT
 
-  ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo mkdir -p '$GHE_REMOTE_DATA_USER_DIR/tmp'" 1>&3
+ghe-ssh $ssh_config_file_opt "$GHE_RESTORE_HOST" -- "sudo mkdir -p '$GHE_REMOTE_DATA_USER_DIR/tmp'" 1>&3
 
-  # Transfer MySQL data from the snapshot to the GitHub instance.
-  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"
+# Transfer MySQL data from the snapshot to the GitHub instance.
+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"
 
-  echo "Restore MySQL database ..."
-  # Import the database
-  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
-fi
+echo "Restore MySQL database ..."
+# Import the database
+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
 
 bm_end "$(basename $0)"

test/test-ghe-backup-config.sh

@@ -224,4 +224,4 @@ begin_test "ghe-backup-config is_service_external unknown service"
 
   ! is_service_external 'hubot' $tmpfile
 )
-end_test
+end_test