github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82111 from xieyanker/xieyanker-patch-2

Browse Source 
remove stateCheckPeriod
This commit is contained in:
Kubernetes Prow Robot 2020-02-05 04:17:55 -08:00 committed by GitHub
commit d90dd93855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubelet/kuberuntime/logs/logs.go
View File

@ -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
}
} }
} }
} }