github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36062 from wojtek-t/etcd_migration_logs

Browse Source 
Automatic merge from submit-queue

Extend etcd migration logs

Ref #20504
This commit is contained in:
Kubernetes Submit Queue 2016-11-02 09:21:23 -07:00 committed by GitHub
commit 2bbc80140a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/images/etcd/migrate-if-needed.sh
View File

@ -114,17 +114,16 @@ start_etcd() {
--listen-client-urls http://127.0.0.1:${ETCD_PORT} \ --listen-client-urls http://127.0.0.1:${ETCD_PORT} \
--advertise-client-urls http://127.0.0.1:${ETCD_PORT} \ --advertise-client-urls http://127.0.0.1:${ETCD_PORT} \
--listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \ --listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \
--initial-advertise-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \ --initial-advertise-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} &
1>>/dev/null 2>&1 &
ETCD_PID=$! ETCD_PID=$!
# Wait until we can write to etcd. # Wait until we can write to etcd.
for i in $(seq 240); do for i in $(seq 240); do
sleep 0.5
ETCDCTL_API="${API_VERSION}" ${ETCDCTL_CMD} 'etcd_version' ${START_VERSION} ETCDCTL_API="${API_VERSION}" ${ETCDCTL_CMD} 'etcd_version' ${START_VERSION}
if [ "$?" -eq "0" ]; then if [ "$?" -eq "0" ]; then
echo "Etcd on port ${ETCD_PORT} is up." echo "Etcd on port ${ETCD_PORT} is up."
return 0 return 0
fi fi
sleep 0.5
done done
echo "Timeout while waiting for etcd on port ${ETCD_PORT}" echo "Timeout while waiting for etcd on port ${ETCD_PORT}"
return 1 return 1