From 89c8a91c0f36d3b43df0340ac5c41b3235d17b30 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Thu, 2 May 2019 09:56:38 -0700 Subject: [PATCH] Check error return from Update Signed-off-by: Ted Yu --- pkg/kubelet/cm/BUILD | 1 + pkg/kubelet/cm/cgroup_manager_linux.go | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/BUILD b/pkg/kubelet/cm/BUILD index a5501a677bb..59b1fa9ba7c 100644 --- a/pkg/kubelet/cm/BUILD +++ b/pkg/kubelet/cm/BUILD @@ -80,6 +80,7 @@ go_library( "//pkg/util/procfs:go_default_library", "//pkg/util/sysctl:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/errors:go_default_library", + "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/version:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index b08bab132d5..b773dabfbd1 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -31,6 +31,7 @@ import ( libcontainerconfigs "github.com/opencontainers/runc/libcontainer/configs" "k8s.io/klog" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/sets" utilfeature "k8s.io/apiserver/pkg/util/feature" kubefeatures "k8s.io/kubernetes/pkg/features" @@ -487,7 +488,9 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error { // it may confuse why we call set after we do apply, but the issue is that runc // follows a similar pattern. it's needed to ensure cpu quota is set properly. - m.Update(cgroupConfig) + if err := m.Update(cgroupConfig); err != nil { + utilruntime.HandleError(fmt.Errorf("cgroup update failed %v", err)) + } return nil }