Revising POC for testing

Co-authored-by: Chuck Pathanjali <[email protected]>

Author: gamefiend

bin/ghe-backup

@@ -122,6 +122,7 @@ trap 'exit $?' INT # ^C always terminate
 # Check to see if there is a running restore
 ghe_restore_check
 
+# Check to see if there is a running backup
 if [ -h ../in-progress ]; then
   echo "Error: detected a backup already in progress from a previous version of ghe-backup." 1>&2
   echo "If there is no backup in progress anymore, please remove" 1>&2

bin/ghe-restore

@@ -164,7 +164,7 @@ GHE_HOSTNAME="${GHE_RESTORE_HOST_OPT:-$GHE_RESTORE_HOST}"
 hostname=$(echo "$GHE_HOSTNAME" | cut -f 1 -d :)
 
 # Show usage with no <host>
-#[ -z "$GHE_HOSTNAME" ] && print_usage
+[ -z "$GHE_HOSTNAME" ] && print_usage
 
 # Flag to indicate if this script has stopped Actions.
 ACTIONS_STOPPED=false
@@ -175,11 +175,9 @@ GHE_RESTORE_SNAPSHOT_PATH="$(ghe-restore-snapshot-path "$snapshot_id")"
 GHE_RESTORE_SNAPSHOT=$(basename "$GHE_RESTORE_SNAPSHOT_PATH")
 export GHE_RESTORE_SNAPSHOT
 
+ghe_backup_check
 ghe_restore_check
-ghe_restore_started $GHE_RESTORE_SNAPSHOT
-#ghe_restore_finished
-echo "This happened without any problems!"
-exit 1
+
 # Detect if the backup we are restoring has a leaked ssh key
 echo "Checking for leaked keys in the backup snapshot that is being restored ..."
 ghe-detect-leaked-ssh-keys -s "$GHE_RESTORE_SNAPSHOT_PATH" || true
@@ -262,6 +260,7 @@ START_TIME=$(date +%s)
 echo 'Start time:' $START_TIME
 echo "Starting restore of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION from snapshot $GHE_RESTORE_SNAPSHOT"
 ghe_remote_logger "Starting restore from $(hostname) with backup-utils v$BACKUP_UTILS_VERSION / snapshot $GHE_RESTORE_SNAPSHOT ..."
+ghe_restore_started $START_TIME
 
 # Keep other processes on the VM or cluster in the loop about the restore status.
 #
@@ -589,6 +588,7 @@ echo 'End time:' $END_TIME
 echo 'Runtime:' $(($END_TIME - $START_TIME)) 'seconds'
 
 echo "Restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT finished."
+ghe_restore_finished
 
 if ! $instance_configured; then
   echo "To complete the restore process, please visit https://$hostname/setup/settings to review and save the appliance configuration."