mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 12:43:23 +00:00
Merge pull request #82111 from xieyanker/xieyanker-patch-2
remove stateCheckPeriod
This commit is contained in:
commit
d90dd93855
@ -51,11 +51,6 @@ const (
|
|||||||
// timeFormat is the time format used in the log.
|
// timeFormat is the time format used in the log.
|
||||||
timeFormat = time.RFC3339Nano
|
timeFormat = time.RFC3339Nano
|
||||||
|
|
||||||
// stateCheckPeriod is the period to check container state while following
|
|
||||||
// the container log. Kubelet should not keep following the log when the
|
|
||||||
// container is not running.
|
|
||||||
stateCheckPeriod = 5 * time.Second
|
|
||||||
|
|
||||||
// logForceCheckPeriod is the period to check for a new read
|
// logForceCheckPeriod is the period to check for a new read
|
||||||
logForceCheckPeriod = 1 * time.Second
|
logForceCheckPeriod = 1 * time.Second
|
||||||
)
|
)
|
||||||
@ -447,10 +442,6 @@ func waitLogs(ctx context.Context, id string, w *fsnotify.Watcher, runtimeServic
|
|||||||
errRetry--
|
errRetry--
|
||||||
case <-time.After(logForceCheckPeriod):
|
case <-time.After(logForceCheckPeriod):
|
||||||
return true, false, nil
|
return true, false, nil
|
||||||
case <-time.After(stateCheckPeriod):
|
|
||||||
if running, err := isContainerRunning(id, runtimeService); !running {
|
|
||||||
return false, false, err
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user