From 8fe12adc208809077432af6f771207d5ba5e227d Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Thu, 23 Nov 2017 15:06:54 -0500 Subject: [PATCH] Warn if OOM monitoring is not available Instead of failing with an error Signed-off-by: Daniel Nephin --- metrics/cgroups/cgroups.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/metrics/cgroups/cgroups.go b/metrics/cgroups/cgroups.go index 2d843040b..c4f837a46 100644 --- a/metrics/cgroups/cgroups.go +++ b/metrics/cgroups/cgroups.go @@ -13,6 +13,7 @@ import ( "github.com/containerd/containerd/plugin" "github.com/containerd/containerd/runtime" metrics "github.com/docker/go-metrics" + "github.com/sirupsen/logrus" "golang.org/x/net/context" ) @@ -71,7 +72,12 @@ func (m *cgroupsMonitor) Monitor(c runtime.Task) error { if err := m.collector.Add(info.ID, info.Namespace, cg); err != nil { return err } - return m.oom.Add(info.ID, info.Namespace, cg, m.trigger) + err = m.oom.Add(info.ID, info.Namespace, cg, m.trigger) + if err == cgroups.ErrMemoryNotSupported { + logrus.WithError(err).Warn("OOM monitoring failed") + return nil + } + return err } func (m *cgroupsMonitor) Stop(c runtime.Task) error {