From c6d8bd8f5e4d57a35b716d2041ca3a72eab4cc1e Mon Sep 17 00:00:00 2001
From: Xiang Li <xiang.li@coreos.com>
Date: Thu, 19 Feb 2015 21:35:57 -0800
Subject: [PATCH] pkg/kubelet: return error when there is no cadvisor
 connection

---
 pkg/kubelet/cadvisor.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kubelet/cadvisor.go b/pkg/kubelet/cadvisor.go
index 0a1295c172..5a36724a04 100644
--- a/pkg/kubelet/cadvisor.go
+++ b/pkg/kubelet/cadvisor.go
@@ -69,7 +69,7 @@ func (kl *Kubelet) statsFromDockerContainer(cc cadvisorInterface, containerId st
 func (kl *Kubelet) GetContainerInfo(podFullName string, uid types.UID, containerName string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) {
 	cc := kl.GetCadvisorClient()
 	if cc == nil {
-		return nil, nil
+		return nil, fmt.Errorf("no cadvisor connection")
 	}
 	dockerContainers, err := dockertools.GetKubeletDockerContainers(kl.dockerClient, false)
 	if err != nil {