github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9266 from yujuhong/err_msg

Browse Source 
Kubelet: fix the warning message
This commit is contained in:
Quinton Hoole 2015-06-04 11:55:46 -07:00
commit 70f78aa5bf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubelet/container_manager_linux.go
View File

@ -136,10 +136,11 @@ func (cm *containerManagerImpl) Start() error {
go util.Until(func() { go util.Until(func() {
for _, cont := range cm.systemContainers { for _, cont := range cm.systemContainers {
if cont.ensureStateFunc != nil { if cont.ensureStateFunc != nil {
err := cont.ensureStateFunc(cont.manager) if err := cont.ensureStateFunc(cont.manager); err != nil {
glog.Warningf("[ContainerManager] Failed to ensure state of %q: %v", cont.name, err) glog.Warningf("[ContainerManager] Failed to ensure state of %q: %v", cont.name, err)
} }
} }
}
}, time.Minute, util.NeverStop) }, time.Minute, util.NeverStop)
return nil return nil
@ -227,7 +228,7 @@ func ensureSystemContainer(rootContainer *fs.Manager, manager *fs.Manager) error
allPids, err := rootContainer.GetPids() allPids, err := rootContainer.GetPids()
if err != nil { if err != nil {
errs = append(errs, fmt.Errorf("Failed to list PIDs for root: %v", err)) errs = append(errs, fmt.Errorf("failed to list PIDs for root: %v", err))
continue continue
} }