github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Warn if OOM monitoring is not available

Browse Source 
Instead of failing with an error

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
This commit is contained in:
Daniel Nephin 2017-11-23 15:06:54 -05:00
parent 4af5f65752
commit 8fe12adc20
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metrics/cgroups/cgroups.go
View File

@ -13,6 +13,7 @@ import (
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/runtime" "github.com/containerd/containerd/runtime"
metrics "github.com/docker/go-metrics" metrics "github.com/docker/go-metrics"
"github.com/sirupsen/logrus"
"golang.org/x/net/context" "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 { if err := m.collector.Add(info.ID, info.Namespace, cg); err != nil {
return err 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 { func (m *cgroupsMonitor) Stop(c runtime.Task) error {