github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #45496 from andyxning/fix_pleg_relist_time

Browse Source 
Automatic merge from submit-queue

fix pleg relist time

This PR fix pleg reslist time. According to current implementation, we have a `Healthy` method periodically check the relist time. If current timestamp subtracts latest relist time is longer than `relistThreshold`(default is 3 minutes), we should return an error to indicate the error of runtime.

`relist` method is also called periodically. If runtime(docker) hung, the relist method should return immediately without updating the latest relist time. If we update latest relist time no matter runtime(docker) hung(default timeout is 2 minutes), the `Healthy` method will never return an error.

```release-note
Kubelet PLEG updates the relist timestamp only after successfully relisting.
```

/cc @yujuhong @Random-Liu @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2017-05-21 04:17:14 -07:00 committed by GitHub
commit c1f8fcd9fe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/pleg/generic.go
View File

@ -186,8 +186,6 @@ func (g *GenericPLEG) relist() {
}
timestamp := g.clock.Now()
// Update the relist time.
g.updateRelisTime(timestamp)
defer func() {
metrics.PLEGRelistLatency.Observe(metrics.SinceInMicroseconds(timestamp))
}()
@ -198,6 +196,10 @@ func (g *GenericPLEG) relist() {
glog.Errorf("GenericPLEG: Unable to retrieve pods: %v", err)
return
}
// Update the relist time.
g.updateRelisTime(timestamp)
pods := kubecontainer.Pods(podList)
g.podRecords.setCurrent(pods)