Merge branch 'master' into djdefi-rsync-bumperfix

Author: djdefi

bin/ghe-backup

@@ -121,6 +121,8 @@ cleanup () {
 
   # Cleanup SSH multiplexing
   ghe-ssh --clean
+
+  bm_end "$(basename $0)"
 }
 
 # Setup exit traps
@@ -216,6 +218,7 @@ fi
 echo "$GHE_SNAPSHOT_TIMESTAMP $$" > ../in-progress
 echo "$GHE_SNAPSHOT_TIMESTAMP $$" > "${GHE_DATA_DIR}/in-progress-backup"
 
+bm_start "$(basename $0)"
 START_TIME=$(date +%s)
 log_info "Starting backup of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION in snapshot $GHE_SNAPSHOT_TIMESTAMP"
 

bin/ghe-host-check

@@ -168,6 +168,13 @@ SKIP_MSG
   # shellcheck source=share/github-backup-utils/ghe-rsync-size
   . "$(dirname "${BASH_SOURCE[0]}")/../share/github-backup-utils/ghe-rsync-size"
 
+  #Check if GHE_DATA_DIR is NFS mounted
+  fs_info=$(stat -f -c "%T" "$GHE_DATA_DIR") || true
+  if [ "$fs_info" == "nfs" ]; then
+    echo "Warning: NFS (Network File System) detected for $GHE_DATA_DIR" 1>&2
+    echo "Please review https://gh.io/backup-utils-storage-requirements for details." 1>&2
+  fi
+
   #Display dir requirements for repositories and mysql
   echo "" 1>&2
   echo "Checking host for sufficient space for a backup..." 1>&2

bin/ghe-restore

@@ -138,6 +138,8 @@ cleanup () {
   if ! rm -f "${GHE_DATA_DIR}/in-progress-restore"; then
     log_error "Failed to remove in-progress file" 1>&3
   fi
+
+  bm_end "$(basename $0)"
 }
 
 # This function's type definition is being passed to a remote host via `ghe-ssh` but is not used locally.
@@ -322,6 +324,7 @@ export PROGRESS=0 # Used to track progress of restore
 echo "$PROGRESS" > /tmp/backup-utils-progress/progress
 
 # Log restore start message locally and in /var/log/syslog on remote instance
+bm_start "$(basename $0)"
 START_TIME=$(date +%s)
 log_info "Starting restore of $GHE_HOSTNAME with backup-utils v$BACKUP_UTILS_VERSION from snapshot $GHE_RESTORE_SNAPSHOT"
 

docs/requirements.md

@@ -57,6 +57,8 @@ Using a [case sensitive][7] file system is also required to avoid conflicts.
 
 Performance of backup and restore operations are also dependent on the backup host's storage. We recommend using a high performance storage system with low latency and high IOPS.
 
+Please avoid using an NFS mount for the data directory (where backup data is stored) as this can cause performance issues and timeouts during backups.
+
 ## GitHub Enterprise Server version requirements
 
 Starting with Backup Utilities v2.13.0, version support is inline with that of the

test/testlib.sh

@@ -87,6 +87,8 @@ setup_remote_metadata () {
   mkdir -p "$GHE_REMOTE_DATA_DIR" "$GHE_REMOTE_DATA_USER_DIR"
   mkdir -p "$GHE_REMOTE_DATA_USER_DIR/common"
   mkdir -p "$GHE_REMOTE_ROOT_DIR/etc/github"
+  # Create fake remote repositories dir
+  mkdir -p "$GHE_REMOTE_DATA_USER_DIR/repositories"
 }
 setup_remote_metadata