mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 06:54:01 +00:00
Merge pull request #39691 from yujuhong/bump_timeout
Automatic merge from submit-queue (batch tested with PRs 39694, 39383, 39651, 39691, 39497) Bump container-linux and gci timeout for docker health check The command `docker ps` can take longer time to respond under heavy load or when encountering some known issues. In these cases, the containers are running fine, so aggressive health check could cause serious disruption. Bump the timeout to 60s to be consistent with the debian-based containerVM. This addresses #38588
This commit is contained in:
commit
ebc8e40694
@ -26,7 +26,7 @@ set -o pipefail
|
||||
# automatically restart the process.
|
||||
function docker_monitoring {
|
||||
while [ 1 ]; do
|
||||
if ! timeout 10 docker ps > /dev/null; then
|
||||
if ! timeout 60 docker ps > /dev/null; then
|
||||
echo "Docker daemon failed!"
|
||||
pkill docker
|
||||
# Wait for a while, as we don't want to kill it again before it is really up.
|
||||
|
@ -26,7 +26,7 @@ set -o pipefail
|
||||
# automatically restart the process.
|
||||
function docker_monitoring {
|
||||
while [ 1 ]; do
|
||||
if ! timeout 10 docker ps > /dev/null; then
|
||||
if ! timeout 60 docker ps > /dev/null; then
|
||||
echo "Docker daemon failed!"
|
||||
pkill docker
|
||||
# Wait for a while, as we don't want to kill it again before it is really up.
|
||||
|
Loading…
Reference in New Issue
Block a user