Merge pull request #743 from github/enterprise-3.11-backport-revert-cluster-changes

Enterprise 3.11 backport revert cluster changes

Author: amildahl

backup.config-example

@@ -32,10 +32,6 @@ GHE_NUM_SNAPSHOTS=10
 # disk space validation and software version checks on the backup-host will be disabled.
 #GHE_SKIP_CHECKS=false
 
-# Cluster filesystem to check if it's writable as part of ghe-host-check
-# By default it is /data/user/tmp but can be updated if needed
-#GHE_FILE_SYSTEM_WRITE_CHECK="/data/user/tmp"
-
 # The hostname of the GitHub appliance to restore. If you've set up a separate
 # GitHub appliance to act as a standby for recovery, specify its IP or hostname
 # here. The host to restore to may also be specified directly when running

bin/ghe-backup

@@ -377,7 +377,7 @@ if [ -z "$failures" ]; then
   else
     log_info "Expired and incomplete snapshots to be pruned separately"
   fi
-else
+else 
   log_info "Skipping pruning snapshots, since some backups failed..."
 fi
 

bin/ghe-host-check

@@ -85,33 +85,28 @@ if [ $rc -ne 0 ]; then
   exit $rc
 fi
 
-if [ -z "$CLUSTER" ]; then
-  CLUSTER=false
-fi
+CLUSTER=false
 if ghe-ssh "$host" -- \
   "[ -f '$GHE_REMOTE_ROOT_DIR/etc/github/cluster' ]"; then
   CLUSTER=true
 fi
 
-set +e
 # ensure all nodes in the cluster are online/reachable and running the same version
 if "$CLUSTER"; then
   online_status=$(ghe-ssh "$host" ghe-cluster-host-check)
   if [ "$online_status" != "Cluster is ready to configure." ]; then
-    echo "$online_status" 1>&2
-    log_error "Error: Not all nodes are online! Please ensure cluster is in a healthy state before using backup-utils." 1>&2
+    echo "Error: Not all nodes are online! Please ensure cluster is in a healthy state before using backup-utils." 1>&2
     exit 1
   fi
 
   node_version_list=$(ghe-ssh "$host" ghe-cluster-each -- ghe-version)
   distinct_versions=$(echo "$node_version_list" | awk '{split($0, a, ":"); print a[2]}' | awk '{print $4}' | uniq | wc -l)
   if [ "$distinct_versions" -ne 1 ]; then
     echo "Version mismatch: $node_version_list" 1>&2
-    log_error "Error: Not all nodes are running the same version! Please ensure all nodes are running the same version before using backup-utils." 1>&2
+    echo "Error: Not all nodes are running the same version! Please ensure all nodes are running the same version before using backup-utils." 1>&2
     exit 1
   fi
 fi
-set -e
 
 version=$(echo "$output" | grep "GitHub Enterprise" | awk '{print $NF}')
 
@@ -120,37 +115,6 @@ if [ -z "$version" ]; then
   exit 2
 fi
 
-NON_WRITABLE=""
-# ensure all nodes are writable
-if [ "$CLUSTER" == "true" ] ; then
-  if [ -z "$GHE_FILE_SYSTEM_WRITE_CHECK" ]; then
-    if [ -d "/data/user/tmp" ]; then
-      WRITE_CHECK_FILE="/data/user/tmp/test-ro-file.txt"
-    else
-      WRITE_CHECK_FILE="/tmp/test-ro-file.txt"
-    fi
-  else
-    WRITE_CHECK_FILE="$GHE_FILE_SYSTEM_CHECK/test-ro-file.txt"
-  fi
-
-  # Iterate through each node in the cluster
-  nodes=$(ghe-ssh "$host" ghe-cluster-nodes)
-  for node in $nodes; do
-    if ! echo "set -o pipefail; ssh $node -- 'touch $WRITE_CHECK_FILE && rm $WRITE_CHECK_FILE'" | ghe-ssh "$host" /bin/bash; then
-      echo "File system is not writeable or no permission on $node" 1>&2
-      NON_WRITABLE+="$node "
-    fi || true
-  done
-  # Display the comma-separated list of non-writable nodes
-  if [ -n "$NON_WRITABLE" ]; then
-    NON_WRITABLE=$(echo "$NON_WRITABLE" | sed 's/ /, /g; s/, $//')
-    log_error "Error: Following nodes are non-writable - $NON_WRITABLE. Please make sure the filesystem for all GHES nodes are writable." 1>&2
-    exit 1
-  else
-    log_info "All nodes are writable."
-  fi
-fi
-
 # Block restoring snapshots to older releases of GitHub Enterprise Server
 if [ -n "$GHE_RESTORE_SNAPSHOT_PATH" ]; then
   snapshot_version=$(cat $GHE_RESTORE_SNAPSHOT_PATH/version)
@@ -213,7 +177,7 @@ SKIP_MSG
 
   #Display dir requirements for repositories and mysql
   echo -e "\nChecking host for sufficient space for a backup..."
-  available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}')
+  available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}') 
   echo "  We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time."
 
   repos_disk_size=$(transfer_size repositories /tmp)

test/test-ghe-host-check.sh

@@ -122,18 +122,3 @@ begin_test "ghe-host-check blocks restore to old release"
   ! GHE_TEST_REMOTE_VERSION=$bu_version_major.$((bu_version_minor-1)).$bu_version_patch ghe-restore -v
 )
 end_test
-
-# Check ghe-host-check detects RO file system
-begin_test "ghe-host-check fails when encountering RO file-system"
-(
-  set -e
-
-  ghe-ssh "$GHE_HOSTNAME" -- 'mkdir -p "~/tmp"'
-  # Remove write access in ~/tmp
-  ghe-ssh "$GHE_HOSTNAME" -- 'chmod a-w -R "~/tmp"'
-
-  # File creation fails for CLUSTER
-  ! WRITE_CHECK_FILE="$HOME/tmp/test" CLUSTER=true GHE_ALLOW_REPLICA_BACKUP=no ghe-host-check
-  WRITE_CHECK_FILE="$HOME/tmp/test" CLUSTER=false GHE_ALLOW_REPLICA_BACKUP=no ghe-host-check
-)
-end_test