From e9ed0bfea5f9e2d5b93ae0734e5d9538f7f01851 Mon Sep 17 00:00:00 2001 From: Victor Marmol Date: Thu, 12 Jun 2014 17:07:13 -0700 Subject: [PATCH] Move to using the libcontainer repo directly. Return empty stats for / and /docker in the docker driver --- container/docker/handler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index 15a36542..80cb7fc7 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -24,9 +24,9 @@ import ( "strings" "time" + "github.com/docker/libcontainer/cgroups" + "github.com/docker/libcontainer/cgroups/fs" "github.com/dotcloud/docker/nat" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups" - "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" "github.com/fsouza/go-dockerclient" "github.com/google/cadvisor/container" "github.com/google/cadvisor/info" @@ -260,6 +260,9 @@ func libcontainerToContainerStats(s *cgroups.Stats, mi *info.MachineInfo) *info. func (self *dockerContainerHandler) GetStats() (stats *info.ContainerStats, err error) { if !self.isDockerContainer() { + // Return empty stats for root containers. + stats = new(info.ContainerStats) + stats.Timestamp = time.Now() return } mi, err := self.machineInfoFactory.GetMachineInfo()