Skip to content

K
k3s
Commit 2bbc8014 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36062 from wojtek-t/etcd_migration_logs

Automatic merge from submit-queue Extend etcd migration logs Ref #20504
parents 85fe0f1a dc6571a5
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
cluster/images/etcd/migrate-if-needed.sh
View file @ 2bbc8014
...@@ -114,17 +114,16 @@ start_etcd() { ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment