From 22c88d96b0a9e80cf6ec5e538963d17b6d350443 Mon Sep 17 00:00:00 2001
From: Eric Paris <eparis@redhat.com>
Date: Fri, 5 Dec 2014 19:02:44 -0500
Subject: [PATCH] "support" the new libcontiner
---
container/libcontainer/helpers.go | 10 +---------
container/raw/handler.go | 1 -
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/container/libcontainer/helpers.go b/container/libcontainer/helpers.go
index 2d28e6f..156bbce 100644
--- a/container/libcontainer/helpers.go
+++ b/container/libcontainer/helpers.go
@@ -30,7 +30,7 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe
stats := &libcontainer.ContainerStats{}
var err error
- stats.CgroupStats, err = cgroupfs.GetStats(cgroup)
+ stats.CgroupStats, err = cgroupfs.GetStats(state.CgroupPaths)
if err != nil {
return &info.ContainerStats{}, err
}
@@ -39,14 +39,6 @@ func GetStats(cgroup *cgroups.Cgroup, state *libcontainer.State) (*info.Containe
return toContainerStats(stats), nil
}
-func GetStatsCgroupOnly(cgroup *cgroups.Cgroup) (*info.ContainerStats, error) {
- s, err := cgroupfs.GetStats(cgroup)
- if err != nil {
- return nil, err
- }
- return toContainerStats(&libcontainer.ContainerStats{CgroupStats: s}), nil
-}
-
func DiskStatsCopy(blkio_stats []cgroups.BlkioStatEntry) (stat []info.PerDiskStats) {
if len(blkio_stats) == 0 {
return
diff --git a/container/raw/handler.go b/container/raw/handler.go
index 433a07b..1bc3d1f 100644
--- a/container/raw/handler.go
+++ b/container/raw/handler.go
@@ -252,7 +252,6 @@ func (self *rawContainerHandler) GetStats() (*info.ContainerStats, error) {
NetworkState: network.NetworkState{
VethHost: self.networkInterface.VethHost,
VethChild: self.networkInterface.VethChild,
- NsPath: "unknown",
},
}
}
--
1.9.3