From 7e1cfc1f6a727809a7d858ce6fa606550ea07b7d Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 11 Jul 2014 12:05:59 -0700 Subject: [PATCH] Dont fail on missing subsystem for systemd stats Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- cgroups/fs/apply_raw.go | 1 + cgroups/systemd/apply_systemd.go | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/cgroups/fs/apply_raw.go b/cgroups/fs/apply_raw.go index 2d5a1c0ea..e9c06e1e2 100644 --- a/cgroups/fs/apply_raw.go +++ b/cgroups/fs/apply_raw.go @@ -75,6 +75,7 @@ func GetStats(c *cgroups.Cgroup) (*cgroups.Stats, error) { if err == cgroups.ErrNotFound { continue } + return nil, err } diff --git a/cgroups/systemd/apply_systemd.go b/cgroups/systemd/apply_systemd.go index ea3a53349..5755a5f4b 100644 --- a/cgroups/systemd/apply_systemd.go +++ b/cgroups/systemd/apply_systemd.go @@ -422,6 +422,11 @@ func GetStats(c *cgroups.Cgroup) (*cgroups.Stats, error) { for sysname, sys := range subsystems { subsystemPath, err := getSubsystemPath(c, sysname) if err != nil { + // Don't fail if a cgroup hierarchy was not found, just skip this subsystem + if err == cgroups.ErrNotFound { + continue + } + return nil, err }