From 6433e2dd2b6e783861db1bfaf5b6ab5c30d36a6c Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 19 Feb 2015 21:30:24 -0800 Subject: [PATCH 1/4] pkg/kubelet: uncaptialize the error message in cadvisor.go --- pkg/kubelet/cadvisor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cadvisor.go b/pkg/kubelet/cadvisor.go index c60bec0ba65..bb05d6846f5 100644 --- a/pkg/kubelet/cadvisor.go +++ b/pkg/kubelet/cadvisor.go @@ -27,13 +27,13 @@ import ( var ( // ErrNoKubeletContainers returned when there are not containers managed by the kubelet (ie: either no containers on the node, or none that the kubelet cares about). - ErrNoKubeletContainers = errors.New("No containers managed by kubelet") + ErrNoKubeletContainers = errors.New("no containers managed by kubelet") // ErrContainerNotFound returned when a container in the given pod with the given container name was not found, amongst those managed by the kubelet. - ErrContainerNotFound = errors.New("No matching container") + ErrContainerNotFound = errors.New("no matching container") // ErrCadvisorApiFailure returned when cadvisor couldn't retrieve stats for the given container, either because it isn't running or it was confused by the request - ErrCadvisorApiFailure = errors.New("Failed to retrieve cadvisor stats") + ErrCadvisorApiFailure = errors.New("failed to retrieve cadvisor stats") ) // cadvisorInterface is an abstract interface for testability. It abstracts the interface of "github.com/google/cadvisor/client".Client. From ce1ced4322ae482ed8e36bbad115394fd2d28c63 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 19 Feb 2015 21:34:52 -0800 Subject: [PATCH 2/4] pkg/kubelet: make comments follow go-style --- pkg/kubelet/cadvisor.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cadvisor.go b/pkg/kubelet/cadvisor.go index bb05d6846f5..0a1295c172c 100644 --- a/pkg/kubelet/cadvisor.go +++ b/pkg/kubelet/cadvisor.go @@ -43,8 +43,8 @@ type cadvisorInterface interface { MachineInfo() (*cadvisor.MachineInfo, error) } -// This method takes a container's absolute path and returns the stats for the -// container. The container's absolute path refers to its hierarchy in the +// statsFromContainerPath takes a container's absolute path and returns the stats for the +// container. The container's absolute path refers to its hierarchy in the // cgroup file system. e.g. The root container, which represents the whole // machine, has path "/"; all docker containers have path "/docker/" func (kl *Kubelet) statsFromContainerPath(cc cadvisorInterface, containerPath string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { @@ -55,7 +55,7 @@ func (kl *Kubelet) statsFromContainerPath(cc cadvisorInterface, containerPath st return cinfo, nil } -// This method takes a Docker container's ID and returns the stats for the +// statsFromDockerContainer takes a Docker container's ID and returns the stats for the // container. func (kl *Kubelet) statsFromDockerContainer(cc cadvisorInterface, containerId string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { cinfo, err := cc.DockerContainer(containerId, req) From c6d8bd8f5e4d57a35b716d2041ca3a72eab4cc1e Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 19 Feb 2015 21:35:57 -0800 Subject: [PATCH 3/4] 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 0a1295c172c..5a36724a04d 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 { From 5dc20421dcfa1fcbc10c0996d809a7599140c8e0 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Thu, 19 Feb 2015 21:40:17 -0800 Subject: [PATCH 4/4] pkg/kubelet: drop the unnecessary method receiver --- pkg/kubelet/cadvisor.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/cadvisor.go b/pkg/kubelet/cadvisor.go index 5a36724a04d..dea20db07dc 100644 --- a/pkg/kubelet/cadvisor.go +++ b/pkg/kubelet/cadvisor.go @@ -47,7 +47,7 @@ type cadvisorInterface interface { // container. The container's absolute path refers to its hierarchy in the // cgroup file system. e.g. The root container, which represents the whole // machine, has path "/"; all docker containers have path "/docker/" -func (kl *Kubelet) statsFromContainerPath(cc cadvisorInterface, containerPath string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { +func statsFromContainerPath(cc cadvisorInterface, containerPath string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { cinfo, err := cc.ContainerInfo(containerPath, req) if err != nil { return nil, err @@ -57,7 +57,7 @@ func (kl *Kubelet) statsFromContainerPath(cc cadvisorInterface, containerPath st // statsFromDockerContainer takes a Docker container's ID and returns the stats for the // container. -func (kl *Kubelet) statsFromDockerContainer(cc cadvisorInterface, containerId string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { +func statsFromDockerContainer(cc cadvisorInterface, containerId string, req *cadvisor.ContainerInfoRequest) (*cadvisor.ContainerInfo, error) { cinfo, err := cc.DockerContainer(containerId, req) if err != nil { return nil, err @@ -83,7 +83,7 @@ func (kl *Kubelet) GetContainerInfo(podFullName string, uid types.UID, container return nil, ErrContainerNotFound } - ci, err := kl.statsFromDockerContainer(cc, dockerContainer.ID, req) + ci, err := statsFromDockerContainer(cc, dockerContainer.ID, req) if err != nil { return nil, ErrCadvisorApiFailure } @@ -96,7 +96,7 @@ func (kl *Kubelet) GetRootInfo(req *cadvisor.ContainerInfoRequest) (*cadvisor.Co if cc == nil { return nil, fmt.Errorf("no cadvisor connection") } - return kl.statsFromContainerPath(cc, "/", req) + return statsFromContainerPath(cc, "/", req) } func (kl *Kubelet) GetMachineInfo() (*cadvisor.MachineInfo, error) {