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

Merge pull request #1803 from dnephin/warn-on-mem-not-supported

Browse Source 
Warn if OOM monitoring is not available instead of error
This commit is contained in:
Phil Estes 2017-11-27 11:07:11 -05:00 committed by GitHub
commit ff6c12b284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/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 {