mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #54099 from dchen1107/docker
Automatic merge from submit-queue (batch tested with PRs 54987, 55221, 54099, 55144, 54215). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Increase waiting time (120s) for docker startup in health-monitor.sh Fix the issue of killing docker again when startup takes longer time on overloaded nodes.
This commit is contained in:
commit
664c7e8cf4
@ -30,7 +30,7 @@ function docker_monitoring {
|
|||||||
echo "Docker daemon failed!"
|
echo "Docker daemon failed!"
|
||||||
pkill docker
|
pkill docker
|
||||||
# Wait for a while, as we don't want to kill it again before it is really up.
|
# Wait for a while, as we don't want to kill it again before it is really up.
|
||||||
sleep 30
|
sleep 120
|
||||||
else
|
else
|
||||||
sleep "${SLEEP_SECONDS}"
|
sleep "${SLEEP_SECONDS}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user