Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clean up stale HA nodes on restore #396

Merged
merged 12 commits into from May 21, 2018
Merged

Clean up stale HA nodes on restore #396

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
90b7666
Clean up stale HA nodes
lildude Apr 26, 2018
786af0f
Merge branch 'master' into lildude/clean-old-nodes-on-restore
lildude May 4, 2018
374ff58
Merge branch 'master' into lildude/clean-old-nodes-on-restore
lildude May 10, 2018
75f8209
Merge branch 'master' into lildude/clean-old-nodes-on-restore
lildude May 14, 2018
230d1c1
Remove all other nodes
lildude May 14, 2018
8fcb84c
Simplify and make more readible
lildude May 16, 2018
99a8ea3
Add dummy cmds for testing
lildude May 17, 2018
b96b87a
Test to ensure stale node cleanup takes place
lildude May 17, 2018
06279da
Merge branch 'master' into lildude/clean-old-nodes-on-restore
lildude May 17, 2018
e34aede
Install jq on Travis
lildude May 17, 2018
b74d601
Merge branch 'lildude/clean-old-nodes-on-restore' of github.com:githu…
lildude May 17, 2018
184156d
Merge branch 'master' into lildude/clean-old-nodes-on-restore
lildude May 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 7 additions & 3 deletions bin/ghe-restore
View file
Open in desktop
Expand Up @@ -343,10 +343,14 @@ fi

# Clean up all stale replicas
if ! $CLUSTER; then
inactive_nodes=$(echo "ghe-spokes server show inactive --json | jq -r '.[] | select(.host | contains(\"git-server\")).host' | sed 's/^git-server-//g'" | ghe-ssh "$GHE_HOSTNAME" -- /bin/bash)
if [ -n "$inactive_nodes" ]; then
restored_uuid=$(cat $GHE_RESTORE_SNAPSHOT_PATH/uuid)
other_nodes=$(echo "ghe-spokes server show --json | jq -r '.[] | select(.host | contains(\"git-server\")).host' | sed 's/^git-server-//g'" | ghe-ssh "$GHE_HOSTNAME" -- /bin/bash)
Copy link
Member

@snh snh May 14, 2018 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To reduce lines of code by 3, could we just add a | grep -F -x -v \"$restored_uuid\" to the end of the large collection of piped commands here? Or would this reduce the readability too much?

if [ -n "$other_nodes" ]; then
echo "Cleaning up stale nodes ..."
for uuid in $inactive_nodes; do
for uuid in $other_nodes; do
if [ "$uuid" = "$restored_uuid" ]; then
continue
fi
ghe-ssh "$GHE_HOSTNAME" -- "/usr/local/share/enterprise/ghe-cluster-cleanup-node $uuid" 1>&3
done
fi
Expand Down