From 6cb95facf78e07863b671adf6f3073101babe896 Mon Sep 17 00:00:00 2001 From: dengguangxing Date: Thu, 18 Jan 2018 11:47:04 +0800 Subject: [PATCH] runc: print cgroup info if cpuset missing occurs [Changelog]: print cgroup info if cpuset missing occurs [Author]:Shukui Yang Change-Id: I3f8af2b57b441f5f2b4d38cb89d6826a7f24e24b Signed-off-by: dengguangxing --- libcontainer/cgroups/fs/cpuset.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libcontainer/cgroups/fs/cpuset.go b/libcontainer/cgroups/fs/cpuset.go index 550baa4..c05a6f6 100644 --- a/libcontainer/cgroups/fs/cpuset.go +++ b/libcontainer/cgroups/fs/cpuset.go @@ -2,6 +2,7 @@ package fs import ( "errors" + "io/ioutil" "os" "path/filepath" "strconv" @@ -12,6 +13,7 @@ import ( "github.com/opencontainers/runc/libcontainer/cgroups" "github.com/opencontainers/runc/libcontainer/cgroups/fscommon" "github.com/opencontainers/runc/libcontainer/configs" + "github.com/sirupsen/logrus" ) type CpusetGroup struct{} @@ -172,6 +174,26 @@ func (s *CpusetGroup) ApplyDir(dir string, r *configs.Resources, pid int) error } func getCpusetSubsystemSettings(parent string) (cpus, mems string, err error) { + defer func() { + if err != nil { + minfo, err1 := ioutil.ReadFile("/proc/self/mountinfo") + if err1 != nil { + logrus.Errorf("Failed to read mountinfo when getSubsystemSettings get an error") + } + + dirInfo := "" + fs, err2 := ioutil.ReadDir(parent) + if err2 != nil { + logrus.Errorf("Failed to read mountinfo when getSubsystemSettings get an error") + } + for _, f := range fs { + dirInfo = dirInfo + " " + f.Name() + } + + logrus.Errorf("Read cpuset cgroup failed, print mountinfo and cgroup info here"+ + "path: %s, mountinfo: [%s], dirinfo: [%s]", parent, string(minfo), dirInfo) + } + }() if cpus, err = cgroups.ReadFile(parent, "cpuset.cpus"); err != nil { return } -- 2.33.0