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

Author: gamefiend

bin/ghe-backup

@@ -44,6 +44,10 @@ done
 # Check to make sure moreutils parallel is installed and working properly
 ghe_parallel_check
 
+
+echo "We got here without any problems"
+exit 1
+
 # Used to record failed backup steps
 failures=
 failures_file="$(mktemp -t backup-utils-backup-failures-XXXXXX)"
@@ -114,6 +118,10 @@ cleanup () {
 trap 'cleanup' EXIT
 trap 'exit $?' INT # ^C always terminate
 
+
+# Check to see if there is a running restore
+ghe_restore_check
+
 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

@@ -122,6 +122,8 @@ cleanup () {
 
   # Cleanup SSH multiplexing
   ghe-ssh --clean
+  # Remove in-progress file
+  ghe_restore_finished
 }
 
 # This function's type definition is being passed to a remote host via `ghe-ssh` but is not used locally.
@@ -152,14 +154,17 @@ cleanup_cluster_nodes() {
 # Check to make sure moreutils parallel is installed and working properly
 ghe_parallel_check
 
+# Check to make sure a restore or backup is not in progress
+
+
 # Grab the host arg
 GHE_HOSTNAME="${GHE_RESTORE_HOST_OPT:-$GHE_RESTORE_HOST}"
 
 # Hostname without any port suffix
 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
@@ -170,6 +175,11 @@ GHE_RESTORE_SNAPSHOT_PATH="$(ghe-restore-snapshot-path "$snapshot_id")"
 GHE_RESTORE_SNAPSHOT=$(basename "$GHE_RESTORE_SNAPSHOT_PATH")
 export GHE_RESTORE_SNAPSHOT
 
+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

share/github-backup-utils/ghe-backup-config

@@ -66,6 +66,67 @@ for f in "$GHE_BACKUP_CONFIG" "$GHE_BACKUP_ROOT/backup.config" \
   fi
 done
 
+GHE_RESTORE_IN_PROGRESS="${GHE_DATA_DIR}/.in-progress-restore"
+GHE_BACKUP_IN_PROGRESS="${GHE_DATA_DIR}/.in-progress"
+export GHE_RESTORE_IN_PROGRESS
+export GHE_BACKUP_IN_PROGRESS
+
+ghe_restore_started() {
+echo "$1 $$" > $GHE_RESTORE_IN_PROGRESS
+}
+
+ghe_restore_check() {
+if [ -h $GHE_RESTORE_IN_PROGRESS ]; then
+  echo "Error: detected a restore already in progress from a previous version of ghe-restore." 1>&2
+  echo "If there is no restore in progress anymore, please remove" 1>&2
+  echo "the $GHE_DATA_DIR/in-progress-restore file." 1>&2
+  exit 1
+fi
+
+if [ -f $GHE_RESTORE_IN_PROGRESS ]; then
+  progress=$(cat $GHE_RESTORE_IN_PROGRESS)
+  snapshot=$(echo "$progress" | cut -d ' ' -f 1)
+  pid=$(echo "$progress" | cut -d ' ' -f 2)
+    echo "Error: A restore of $GHE_HOSTNAME may still be running on PID $pid." 1>&2
+    echo "If PID $pid is not a process related to the restore utilities, please remove" 1>&2
+    echo "the $GHE_DATA_DIR/in-progress-restore file and try again." 1>&2
+    exit 1
+  fi
+}
+
+ghe_backup_check() {
+if [ -h $GHE_BACKUP_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
+  echo "the $GHE_DATA_DIR/in-progress-backup file." 1>&2
+  exit 1
+fi
+
+if [ -f $GHE_BACKUP_IN_PROGRESS ]; then
+  progress=$(cat $GHE_BACKUP_IN_PROGRESS)
+  snapshot=$(echo "$progress" | cut -d ' ' -f 1)
+  pid=$(echo "$progress" | cut -d ' ' -f 2)
+    echo "Error: A backup of $GHE_HOSTNAME may still be running on PID $pid." 1>&2
+    echo "If PID $pid is not a process related to the backup utilities, please remove" 1>&2
+    echo "the $GHE_DATA_DIR/in-progress file and try again." 1>&2
+    exit 1
+  fi
+}
+
+ghe_restore_finished() {
+	echo "$GHE_RESTORE_IN_PROGRESS"
+	if [ -f $GHE_RESTORE_IN_PROGRESS ]; then
+		echo "$GHE_RESTORE_IN_PROGRESS exists!" 1>&2
+		rm -f $GHE_RESTORE_IN_PROGRESS
+	fi
+}
+
+ghe_backup_finished() {
+	if [ ! -f $GHE_BACKUP_IN_PROGRESS ]; then
+		rm -f $GHE_BACKUP_IN_PROGRESS
+	fi
+}
+
 ghe_parallel_check() {
   if [ "$GHE_PARALLEL_ENABLED" != "yes" ]; then
     return 0