From f45269be6bc3aaebf26957a511f67414bd47df83 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 5 Sep 2017 13:19:55 -0400 Subject: [PATCH] Update cgroups to 4be134fe43b9e207558365ad2675546b Signed-off-by: Michael Crosby --- vendor.conf | 2 +- vendor/github.com/containerd/cgroups/cgroup.go | 5 ++++- vendor/github.com/containerd/cgroups/memory.go | 7 ++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/vendor.conf b/vendor.conf index 146990740..a42e331c3 100644 --- a/vendor.conf +++ b/vendor.conf @@ -1,7 +1,7 @@ github.com/coreos/go-systemd 48702e0da86bd25e76cfef347e2adeb434a0d0a6 github.com/containerd/go-runc ba22f6a82e52be3be4eb4a00000fe816f4b41c2e 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-events 9461782956ad83b30282bf90e31fa6a70c255ba9 github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f diff --git a/vendor/github.com/containerd/cgroups/cgroup.go b/vendor/github.com/containerd/cgroups/cgroup.go index 5070bd68f..8094faf5d 100644 --- a/vendor/github.com/containerd/cgroups/cgroup.go +++ b/vendor/github.com/containerd/cgroups/cgroup.go @@ -166,7 +166,10 @@ func (c *cgroup) Stat(handlers ...ErrorHandler) (*Metrics, error) { } var ( stats = &Metrics{ - Cpu: &CpuStat{}, + Cpu: &CpuStat{ + Throttling: &Throttle{}, + Usage: &CpuUsage{}, + }, } wg = &sync.WaitGroup{} errs = make(chan error, len(c.subsystems)) diff --git a/vendor/github.com/containerd/cgroups/memory.go b/vendor/github.com/containerd/cgroups/memory.go index 148a66701..1f7c1159a 100644 --- a/vendor/github.com/containerd/cgroups/memory.go +++ b/vendor/github.com/containerd/cgroups/memory.go @@ -87,7 +87,12 @@ func (m *memoryController) Stat(path string, stats *Metrics) error { return err } 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 { return err }