github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Slava Semushin 2018-01-15 20:38:23 +01:00
parent e290741719
commit a2b728a706
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/lib/etcd.sh
View File

@ -74,12 +74,16 @@ kube::etcd::start() {
} }
kube::etcd::stop() { 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() { kube::etcd::clean_etcd_dir() {
rm -rf "${ETCD_DIR-}" if [[ -n "${ETCD_DIR-}" ]]; then
rm -rf "${ETCD_DIR}"
fi
} }
kube::etcd::cleanup() { kube::etcd::cleanup() {

7
hack/update-swagger-spec.sh
View File

@ -37,14 +37,17 @@ make -C "${KUBE_ROOT}" WHAT=cmd/kube-apiserver
function cleanup() 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::etcd::cleanup
kube::log::status "Clean up complete" kube::log::status "Clean up complete"
} }
trap cleanup EXIT SIGINT kube::util::trap_add cleanup EXIT
kube::golang::setup_env kube::golang::setup_env