hack/update-swagger-spec.sh(cleanup): fix signal handler to really cleanup etcd…

hack/update-swagger-spec.sh(cleanup): fix signal handler to really cleanup etcd and minor improvements. Prior this change, etcd wasn't cleaned up on my machine that lead to orphaned etcd process after the update-swagger-spec.sh failed. This change also adds additional improvements: - don't kill/wait/rm when argument is empty. - use kube::util::trap_add.

hack/update-swagger-spec.sh(cleanup): fix signal handler to really cleanup etcd…
a2b728a7 · Slava Semushin · e2907417 · a2b728a7 · a2b728a7
Commit a2b728a7 authored Jan 15, 2018 by Slava Semushin
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 5 deletions

etcd.sh hack/lib/etcd.sh +7 -3

update-swagger-spec.sh hack/update-swagger-spec.sh +5 -2

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -74,12 +74,16 @@ kube::etcd::start() {
 }
 kube::etcd::stop() {
-  kill "${ETCD_PID-}" >/dev/null 2>&1 || :
+  if [[ -n "${ETCD_PID-}" ]]; then
-  wait "${ETCD_PID-}" >/dev/null 2>&1 || :
+    kill "${ETCD_PID}" &>/dev/null || :
+    wait "${ETCD_PID}" &>/dev/null || :
+  fi
 }
 kube::etcd::clean_etcd_dir() {
-  rm -rf "${ETCD_DIR-}"
+  if [[ -n "${ETCD_DIR-}" ]]; then
+    rm -rf "${ETCD_DIR}"
+  fi
 }
 kube::etcd::cleanup() {

--- a/hack/update-swagger-spec.sh
+++ b/hack/update-swagger-spec.sh
@@ -37,14 +37,17 @@ make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
 function cleanup()
 {
-    [[ -n ${APISERVER_PID-} ]] && kill ${APISERVER_PID} 1>&2 2>/dev/null
+    if [[ -n "${APISERVER_PID-}" ]]; then
+      kill "${APISERVER_PID}" &>/dev/null || :
+      wait "${APISERVER_PID}" &>/dev/null || :
+    fi
    kube::etcd::cleanup
    kube::log::status "Clean up complete"
 }
-trap cleanup EXIT SIGINT
+kube::util::trap_add cleanup EXIT
 kube::golang::setup_env