Skip to content

Commit 872f656

Browse files
committed
Revert "Merge pull request #717 from github/daxamin-offline-error"
This reverts commit c1a2b87, reversing changes made to 0889f59.
1 parent 27aa9b5 commit 872f656

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

bin/ghe-backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ if [ -z "$failures" ]; then
377377
else
378378
log_info "Expired and incomplete snapshots to be pruned separately"
379379
fi
380-
else
380+
else
381381
log_info "Skipping pruning snapshots, since some backups failed..."
382382
fi
383383

bin/ghe-host-check

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,22 @@ if ghe-ssh "$host" -- \
9393
CLUSTER=true
9494
fi
9595

96-
set +e
9796
# ensure all nodes in the cluster are online/reachable and running the same version
9897
if "$CLUSTER"; then
9998
online_status=$(ghe-ssh "$host" ghe-cluster-host-check)
10099
if [ "$online_status" != "Cluster is ready to configure." ]; then
101-
echo "$online_status" 1>&2
102-
log_error "Error: Not all nodes are online! Please ensure cluster is in a healthy state before using backup-utils." 1>&2
100+
echo "Error: Not all nodes are online! Please ensure cluster is in a healthy state before using backup-utils." 1>&2
103101
exit 1
104102
fi
105103

106104
node_version_list=$(ghe-ssh "$host" ghe-cluster-each -- ghe-version)
107105
distinct_versions=$(echo "$node_version_list" | awk '{split($0, a, ":"); print a[2]}' | awk '{print $4}' | uniq | wc -l)
108106
if [ "$distinct_versions" -ne 1 ]; then
109107
echo "Version mismatch: $node_version_list" 1>&2
110-
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
108+
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
111109
exit 1
112110
fi
113111
fi
114-
set -e
115112

116113
version=$(echo "$output" | grep "GitHub Enterprise" | awk '{print $NF}')
117114

@@ -213,7 +210,7 @@ SKIP_MSG
213210

214211
#Display dir requirements for repositories and mysql
215212
echo -e "\nChecking host for sufficient space for a backup..."
216-
available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}')
213+
available_space=$(df -B 1k $GHE_DATA_DIR | awk 'END{printf "%.0f", $4 * 1024}')
217214
echo " We recommend allocating at least 5x the amount of storage allocated to the primary GitHub appliance for historical snapshots and growth over time."
218215

219216
repos_disk_size=$(transfer_size repositories /tmp)

0 commit comments

Comments
 (0)