Skip to content

Commit 2bbc801

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request kubernetes#36062 from wojtek-t/etcd_migration_logs
Automatic merge from submit-queue Extend etcd migration logs Ref kubernetes#20504
2 parents 85fe0f1 + dc6571a commit 2bbc801

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

cluster/images/etcd/migrate-if-needed.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,16 @@ start_etcd() {
114114
--listen-client-urls http://127.0.0.1:${ETCD_PORT} \
115115
--advertise-client-urls http://127.0.0.1:${ETCD_PORT} \
116116
--listen-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \
117-
--initial-advertise-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} \
118-
1>>/dev/null 2>&1 &
117+
--initial-advertise-peer-urls http://127.0.0.1:${ETCD_PEER_PORT} &
119118
ETCD_PID=$!
120119
# Wait until we can write to etcd.
121120
for i in $(seq 240); do
121+
sleep 0.5
122122
ETCDCTL_API="${API_VERSION}" ${ETCDCTL_CMD} 'etcd_version' ${START_VERSION}
123123
if [ "$?" -eq "0" ]; then
124124
echo "Etcd on port ${ETCD_PORT} is up."
125125
return 0
126126
fi
127-
sleep 0.5
128127
done
129128
echo "Timeout while waiting for etcd on port ${ETCD_PORT}"
130129
return 1

0 commit comments

Comments
 (0)