Skip to content

Commit a382688

Browse files
authored
Merge pull request #327 from github/fix-cleanup-cluster-nodes
Fix cleanup_cluster_nodes function in ghe-restore
2 parents b1b71df + 5f2437b commit a382688

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

bin/ghe-restore

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ cleanup () {
135135
}
136136

137137
# This function's type definition is being passed to a remote host via `ghe-ssh` but is not used locally.
138+
# because it doesn't run locally does not redirect output to fd 3 or use log_info/log_warn/log_error.
138139
# shellcheck disable=SC2034
139140
cleanup_cluster_nodes() {
140141
uuid="$1"
@@ -143,18 +144,18 @@ cleanup_cluster_nodes() {
143144
exit 2
144145
fi
145146

146-
log_info "Cleaning up spokes" 1>&3
147+
echo "Cleaning up spokes"
147148
ghe-spokes server evacuate "git-server-$uuid" 'Removing replica'
148149
ghe-spokes server destroy "git-server-$uuid"
149150

150-
log_info "Cleaning up storage" 1>&3
151+
echo "Cleaning up storage"
151152
ghe-storage destroy-host "storage-server-$uuid" --force
152153

153-
log_info "Cleaning up dpages" 1>&3
154+
echo "Cleaning up dpages"
154155
ghe-dpages offline "pages-server-$uuid"
155156
ghe-dpages remove "pages-server-$uuid"
156157

157-
log_info "Cleaning up redis" 1>&3
158+
echo "Cleaning up redis"
158159
ghe-redis-cli del "resque:queue:maint_git-server-$uuid"
159160
ghe-redis-cli srem resque:queues "maint_git-server-$uuid"
160161
}

0 commit comments

Comments
 (0)