From 0e603d27091f9b98df5ac50e831105dd262e2d4c Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Thu, 20 Nov 2014 06:43:15 +0800
Subject: [PATCH] Let the raw driver handle the /docker container.

This will give us stats on this container and since the /docker UI
endpoint, it no longer serves the purpose it once did.
---
 container/docker/factory.go |  6 ++----
 container/docker/handler.go | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/container/docker/factory.go b/container/docker/factory.go
index 0811065a..8144e261 100644
--- a/container/docker/factory.go
+++ b/container/docker/factory.go
@@ -117,10 +117,7 @@ func FullContainerName(dockerId string) string {
 
 // Docker handles all containers under /docker
 func (self *dockerFactory) CanHandle(name string) (bool, error) {
-	if name == "/docker" {
-		// We need the docker driver to handle /docker. Otherwise the aggregation at the API level will break.
-		return true, nil
-	} else if !IsDockerContainerName(name) {
+	if !IsDockerContainerName(name) {
 		return false, nil
 	}
 
@@ -203,6 +200,7 @@ func Register(factory info.MachineInfoFactory) error {
 		}
 	}
 
+	glog.Infof("Registering Docker factory")
 	f := &dockerFactory{
 		machineInfoFactory: factory,
 		client:             client,
diff --git a/container/docker/handler.go b/container/docker/handler.go
index dc864ffe..ea4348cb 100644
--- a/container/docker/handler.go
+++ b/container/docker/handler.go
@@ -82,9 +82,6 @@ func newDockerContainerHandler(
 		fsInfo:         fsInfo,
 	}
 	handler.storageDirs = append(handler.storageDirs, path.Join(dockerRootDir, pathToAufsDir, path.Base(name)))
-	if handler.isDockerRoot() {
-		return handler, nil
-	}
 	id := ContainerNameToDockerId(name)
 	handler.id = id
 	ctnr, err := client.InspectContainer(id)
@@ -108,10 +105,6 @@ func (self *dockerContainerHandler) ContainerReference() (info.ContainerReferenc
 	}, nil
 }
 
-func (self *dockerContainerHandler) isDockerRoot() bool {
-	return self.name == "/docker"
-}
-
 // TODO(vmarmol): Switch to getting this from libcontainer once we have a solid API.
 func (self *dockerContainerHandler) readLibcontainerConfig() (config *libcontainer.Config, err error) {
 	configPath := path.Join(self.libcontainerStateDir, self.id, "container.json")
@@ -201,9 +194,6 @@ func libcontainerConfigToContainerSpec(config *libcontainer.Config, mi *info.Mac
 }
 
 func (self *dockerContainerHandler) GetSpec() (spec info.ContainerSpec, err error) {
-	if self.isDockerRoot() {
-		return info.ContainerSpec{}, nil
-	}
 	mi, err := self.machineInfoFactory.GetMachineInfo()
 	if err != nil {
 		return
@@ -266,9 +256,6 @@ func (self *dockerContainerHandler) getFsStats(stats *info.ContainerStats) error
 }
 
 func (self *dockerContainerHandler) GetStats() (stats *info.ContainerStats, err error) {
-	if self.isDockerRoot() {
-		return &info.ContainerStats{}, nil
-	}
 	state, err := self.readLibcontainerState()
 	if err != nil {
 		if err == fileNotFound {