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

Update cgroups to 4be134fe43b9e207558365ad2675546b

Browse Source 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-09-05 13:19:55 -04:00
parent ed45952826
commit f45269be6b
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -1,7 +1,7 @@
github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6
github.com/containerd/go-runc ba22f6a82e52be3be4eb4a00000fe816f4b41c2e github.com/containerd/go-runc ba22f6a82e52be3be4eb4a00000fe816f4b41c2e
github.com/containerd/console 76d18fd1d66972718ab2284449591db0b3cdb4de github.com/containerd/console 76d18fd1d66972718ab2284449591db0b3cdb4de
github.com/containerd/cgroups e364e5d4183340acdf51f943ba033543ecb747d3 github.com/containerd/cgroups 4be134fe43b9e207558365ad2675546b4910f696
github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87 github.com/docker/go-metrics 8fd5772bf1584597834c6f7961a530f06cbfbb87
github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9
github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f

5
vendor/github.com/containerd/cgroups/cgroup.go generated vendored
View File

@ -166,7 +166,10 @@ func (c *cgroup) Stat(handlers ...ErrorHandler) (*Metrics, error) {
} }
var ( var (
stats = &Metrics{ stats = &Metrics{
Cpu: &CpuStat{}, Cpu: &CpuStat{
Throttling: &Throttle{},
Usage: &CpuUsage{},
},
} }
wg = &sync.WaitGroup{} wg = &sync.WaitGroup{}
errs = make(chan error, len(c.subsystems)) errs = make(chan error, len(c.subsystems))

7
vendor/github.com/containerd/cgroups/memory.go generated vendored
View File

@ -87,7 +87,12 @@ func (m *memoryController) Stat(path string, stats *Metrics) error {
return err return err
} }
defer f.Close() defer f.Close()
stats.Memory = &MemoryStat{} stats.Memory = &MemoryStat{
Usage: &MemoryEntry{},
Swap: &MemoryEntry{},
Kernel: &MemoryEntry{},
KernelTcp: &MemoryEntry{},
}
if err := m.parseStats(f, stats.Memory); err != nil { if err := m.parseStats(f, stats.Memory); err != nil {
return err return err
} }