scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #100081 from utsavoza/ugo/issue-98976/10-03-2021

Browse Source 
Migrate pkg/kubelet/cm/cgroup_manager_linux.go to structured logging
This commit is contained in:
Kubernetes Prow Robot
2021-03-16 14:50:22 -07:00
committed by GitHub
parent 21de277402 2f3a4ec9cb
commit f217f3c0f9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -259,7 +259,7 @@ func (m *cgroupManagerImpl) Exists(name CgroupName) bool {
} }
difference := neededControllers.Difference(enabledControllers) difference := neededControllers.Difference(enabledControllers)
if difference.Len() > 0 { if difference.Len() > 0 {
klog.V(4).Infof("The Cgroup %v has some missing controllers: %v", name, difference) klog.V(4).InfoS("The cgroup has some missing controllers", "cgroupName", name, "controllers", difference)
return false return false
} }
return true return true
@@ -292,7 +292,7 @@ func (m *cgroupManagerImpl) Exists(name CgroupName) bool {
} }
if len(missingPaths) > 0 { if len(missingPaths) > 0 {
klog.V(4).Infof("The Cgroup %v has some missing paths: %v", name, missingPaths) klog.V(4).InfoS("The cgroup has some missing paths", "cgroupName", name, "paths", missingPaths)
return false return false
} }
@@ -367,7 +367,7 @@ func setSupportedSubsystemsV1(cgroupConfig *libcontainerconfigs.Cgroup) error {
return fmt.Errorf("failed to find subsystem mount for required subsystem: %v", sys.Name()) return fmt.Errorf("failed to find subsystem mount for required subsystem: %v", sys.Name())
} }
// the cgroup is not mounted, but its not required so continue... // the cgroup is not mounted, but its not required so continue...
klog.V(6).Infof("Unable to find subsystem mount for optional subsystem: %v", sys.Name()) klog.V(6).InfoS("Unable to find subsystem mount for optional subsystem", "subsystemName", sys.Name())
continue continue
} }
if err := sys.Set(cgroupConfig.Paths[sys.Name()], cgroupConfig); err != nil { if err := sys.Set(cgroupConfig.Paths[sys.Name()], cgroupConfig); err != nil {
@@ -485,7 +485,7 @@ func setResourcesV2(cgroupConfig *libcontainerconfigs.Cgroup) error {
if !supportedControllers.Has("hugetlb") { if !supportedControllers.Has("hugetlb") {
cgroupConfig.Resources.HugetlbLimit = nil cgroupConfig.Resources.HugetlbLimit = nil
// the cgroup is not present, but its not required so skip it // the cgroup is not present, but its not required so skip it
klog.V(6).Infof("Optional subsystem not supported: hugetlb") klog.V(6).InfoS("Optional subsystem not supported: hugetlb")
} }
manager, err := cgroupfs2.NewManager(cgroupConfig, filepath.Join(cmutil.CgroupRoot, cgroupConfig.Path), false) manager, err := cgroupfs2.NewManager(cgroupConfig, filepath.Join(cmutil.CgroupRoot, cgroupConfig.Path), false)
@@ -539,7 +539,7 @@ func (m *cgroupManagerImpl) toResources(resourceConfig *ResourceConfig) *libcont
for pageSize, limit := range resourceConfig.HugePageLimit { for pageSize, limit := range resourceConfig.HugePageLimit {
sizeString, err := v1helper.HugePageUnitSizeFromByteSize(pageSize) sizeString, err := v1helper.HugePageUnitSizeFromByteSize(pageSize)
if err != nil { if err != nil {
klog.Warningf("pageSize is invalid: %v", err) klog.InfoS("Invalid pageSize", "err", err)
continue continue
} }
resources.HugetlbLimit = append(resources.HugetlbLimit, &libcontainerconfigs.HugepageLimit{ resources.HugetlbLimit = append(resources.HugetlbLimit, &libcontainerconfigs.HugepageLimit{
@@ -680,7 +680,7 @@ 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 { if err != nil {
klog.V(4).Infof("cgroup manager encountered error scanning cgroup path %q: %v", path, err) klog.V(4).InfoS("Cgroup manager encountered error scanning cgroup path", "path", path, "err", err)
return filepath.SkipDir return filepath.SkipDir
} }
if !info.IsDir() { if !info.IsDir() {
@@ -688,7 +688,7 @@ func (m *cgroupManagerImpl) Pids(name CgroupName) []int {
} }
pids, err = getCgroupProcs(path) pids, err = getCgroupProcs(path)
if err != nil { if err != nil {
klog.V(4).Infof("cgroup manager encountered error getting procs for cgroup path %q: %v", path, err) klog.V(4).InfoS("Cgroup manager encountered error getting procs for cgroup path", "path", path, "err", err)
return filepath.SkipDir return filepath.SkipDir
} }
pidsToKill.Insert(pids...) pidsToKill.Insert(pids...)
@@ -698,7 +698,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 {
klog.V(4).Infof("cgroup manager encountered error scanning pids for directory: %q: %v", dir, err) klog.V(4).InfoS("Cgroup manager encountered error scanning pids for directory", "path", dir, "err", err)
} }
} }
return pidsToKill.List() return pidsToKill.List()
@@ -726,7 +726,7 @@ func getStatsSupportedSubsystems(cgroupPaths map[string]string) (*libcontainercg
return nil, fmt.Errorf("failed to find subsystem mount for required subsystem: %v", sys.Name()) return nil, fmt.Errorf("failed to find subsystem mount for required subsystem: %v", sys.Name())
} }
// the cgroup is not mounted, but its not required so continue... // the cgroup is not mounted, but its not required so continue...
klog.V(6).Infof("Unable to find subsystem mount for optional subsystem: %v", sys.Name()) klog.V(6).InfoS("Unable to find subsystem mount for optional subsystem", "subsystemName", sys.Name())
continue continue
} }
if err := sys.GetStats(cgroupPaths[sys.Name()], stats); err != nil { if err := sys.GetStats(cgroupPaths[sys.Name()], stats); err != nil {