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

etcd should be started after the trap func set

Browse Source
This commit is contained in:
Young 2015-04-05 03:16:27 -04:00
parent c048e6fcbf
commit 802610b13a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/lib/etcd.sh
View File

@ -48,8 +48,16 @@ kube::etcd::start() {
curl -X PUT "http://${host}:${port}/v2/keys/_test" curl -X PUT "http://${host}:${port}/v2/keys/_test"
} }
kube::etcd::cleanup() { kube::etcd::stop() {
kill "${ETCD_PID-}" >/dev/null 2>&1 || : kill "${ETCD_PID-}" >/dev/null 2>&1 || :
wait "${ETCD_PID-}" >/dev/null 2>&1 || : wait "${ETCD_PID-}" >/dev/null 2>&1 || :
}
kube::etcd::clean_etcd_dir() {
rm -rf "${ETCD_DIR-}" rm -rf "${ETCD_DIR-}"
} }
kube::etcd::cleanup() {
kube::etcd::stop
kube::etcd::clean_etcd_dir
}

10
hack/local-up-cluster.sh
View File

@ -36,9 +36,6 @@ if [ "$?" != "0" ]; then
exit 1 exit 1
fi fi
echo "Starting etcd"
kube::etcd::start
# Shut down anyway if there's an error. # Shut down anyway if there's an error.
set +e set +e
@ -106,14 +103,17 @@ cleanup()
[[ -n "${PROXY_PID-}" ]] && sudo kill "${PROXY_PID}" [[ -n "${PROXY_PID-}" ]] && sudo kill "${PROXY_PID}"
[[ -n "${SCHEDULER_PID-}" ]] && sudo kill "${SCHEDULER_PID}" [[ -n "${SCHEDULER_PID-}" ]] && sudo kill "${SCHEDULER_PID}"
[[ -n "${ETCD_PID-}" ]] && kill "${ETCD_PID}" [[ -n "${ETCD_PID-}" ]] && kube::etcd::stop
[[ -n "${ETCD_DIR-}" ]] && rm -rf "${ETCD_DIR}" [[ -n "${ETCD_DIR-}" ]] && kube::etcd::clean_etcd_dir
exit 0 exit 0
} }
trap cleanup EXIT trap cleanup EXIT
echo "Starting etcd"
kube::etcd::start
APISERVER_LOG=/tmp/kube-apiserver.log APISERVER_LOG=/tmp/kube-apiserver.log
sudo -E "${GO_OUT}/kube-apiserver" \ sudo -E "${GO_OUT}/kube-apiserver" \
--v=${LOG_LEVEL} \ --v=${LOG_LEVEL} \