Skip to content

Commit 80537a9

Browse files
authored
Merge pull request kubernetes#77323 from tedyu/cgroup-mgr-linux
Check error return from Update
2 parents 12f3630 + 89c8a91 commit 80537a9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pkg/kubelet/cm/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ go_library(
8080
"//pkg/util/procfs:go_default_library",
8181
"//pkg/util/sysctl:go_default_library",
8282
"//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library",
83+
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
8384
"//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library",
8485
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
8586
"//staging/src/k8s.io/client-go/tools/record:go_default_library",

pkg/kubelet/cm/cgroup_manager_linux.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs"
3232
"k8s.io/klog"
3333

34+
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
3435
"k8s.io/apimachinery/pkg/util/sets"
3536
utilfeature "k8s.io/apiserver/pkg/util/feature"
3637
kubefeatures "k8s.io/kubernetes/pkg/features"
@@ -483,7 +484,9 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error {
483484

484485
// it may confuse why we call set after we do apply, but the issue is that runc
485486
// follows a similar pattern. it's needed to ensure cpu quota is set properly.
486-
m.Update(cgroupConfig)
487+
if err := m.Update(cgroupConfig); err != nil {
488+
utilruntime.HandleError(fmt.Errorf("cgroup update failed %v", err))
489+
}
487490

488491
return nil
489492
}

0 commit comments

Comments
 (0)