Merge pull request #10182 from bprashanth/kubelet_status

Fix kubelet deadlock
This commit is contained in:
Jeff Lowdermilk
2015-06-23 15:40:49 -07:00
7 changed files with 139 additions and 4 deletions

View File

@@ -1845,11 +1845,14 @@ func (kl *Kubelet) GetPodByName(namespace, name string) (*api.Pod, bool) {
}
func (kl *Kubelet) updateRuntimeUp() {
start := time.Now()
err := waitUntilRuntimeIsUp(kl.containerRuntime, 100*time.Millisecond)
kl.runtimeMutex.Lock()
defer kl.runtimeMutex.Unlock()
if err == nil {
kl.lastTimestampRuntimeUp = time.Now()
} else {
glog.Errorf("Container runtime sanity check failed after %v, err: %v", time.Since(start), err)
}
}