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

Merge pull request #1598 from Random-Liu/fix-load-task

Browse Source 
Fix task load.
This commit is contained in:
Phil Estes
2017-10-06 16:38:40 -04:00
committed by GitHub
parent 67bbfc5d1c 28ca8f05d3
commit 987fcd1201
5 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
metrics/cgroups/cgroups.go
View File

@@ -62,10 +62,14 @@ type cgroupsMonitor struct {
func (m *cgroupsMonitor) Monitor(c runtime.Task) error {
info := c.Info()
t := c.(*linux.Task)
if err := m.collector.Add(info.ID, info.Namespace, t.Cgroup()); err != nil {
cg, err := t.Cgroup()
if err != nil {
return err
}
return m.oom.Add(info.ID, info.Namespace, t.Cgroup(), m.trigger)
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)
}
func (m *cgroupsMonitor) Stop(c runtime.Task) error {