Skip to content

Commit 20b437e

Browse files
authored
Merge pull request #407 from github/lildude/handle-empty-result
Handle stale node cleanup when grep filters out all nodes
2 parents ce76dea + 7fa99f7 commit 20b437e

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

bin/ghe-restore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,8 @@ if ! $CLUSTER; then
348348
set -o pipefail; \
349349
ghe-spokes server show --json \
350350
| jq -r '.[] | select(.host | contains(\"git-server\")).host' \
351-
| sed 's/^git-server-//g' | grep -F -x -v \"$restored_uuid\"" \
351+
| sed 's/^git-server-//g' \
352+
| ( grep -F -x -v \"$restored_uuid\" || true )" \
352353
| ghe-ssh "$GHE_HOSTNAME" -- /bin/bash)
353354
if [ -n "$other_nodes" ]; then
354355
echo "Cleaning up stale nodes ..."

0 commit comments

Comments
 (0)