github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Fix kubelet panic in cgroup manager.

Browse Source
This commit is contained in:
Random-Liu 2017-03-10 15:32:58 -08:00
parent 486ec2b7c9
commit e6341cc3c7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -449,12 +449,16 @@ func (m *cgroupManagerImpl) Pids(name CgroupName) []int {
// WalkFunc which is called for each file and directory in the pod cgroup dir // WalkFunc which is called for each file and directory in the pod cgroup dir
visitor := func(path string, info os.FileInfo, err error) error { visitor := func(path string, info os.FileInfo, err error) error {
if err != nil {
glog.V(4).Infof("cgroup manager encountered error scanning cgroup path %q: %v", path, err)
return filepath.SkipDir
}
if !info.IsDir() { if !info.IsDir() {
return nil return nil
} }
pids, err = getCgroupProcs(path) pids, err = getCgroupProcs(path)
if err != nil { if err != nil {
glog.V(5).Infof("cgroup manager encountered error getting procs for cgroup path %v", path) glog.V(4).Infof("cgroup manager encountered error getting procs for cgroup path %q: %v", path, err)
return filepath.SkipDir return filepath.SkipDir
} }
pidsToKill.Insert(pids...) pidsToKill.Insert(pids...)
@ -464,7 +468,7 @@ func (m *cgroupManagerImpl) Pids(name CgroupName) []int {
// container cgroups haven't been GCed yet. Get attached processes to // container cgroups haven't been GCed yet. Get attached processes to
// all such unwanted containers under the pod cgroup // all such unwanted containers under the pod cgroup
if err = filepath.Walk(dir, visitor); err != nil { if err = filepath.Walk(dir, visitor); err != nil {
glog.V(5).Infof("cgroup manager encountered error scanning pids for directory: %v", dir) glog.V(4).Infof("cgroup manager encountered error scanning pids for directory: %q: %v", dir, err)
} }
} }
return pidsToKill.List() return pidsToKill.List()