Merge pull request #26974 from pmorie/log-spam

Automatic merge from submit-queue Reduce log spam in dockertools manager.go Fixes #26972 @kubernetes/sig-node

Merge pull request #26974 from pmorie/log-spam
79321585 · k8s-merge-robot · f1ccc2f1 · 0a0797a6 · 79321585
Commit 79321585 authored Jun 09, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

manager.go pkg/kubelet/dockertools/manager.go +2 -1

No files found.
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -1504,8 +1504,9 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe
 	ref, err := kubecontainer.GenerateContainerRef(pod, container)
 	if err != nil {
 		glog.Errorf("Can't make a ref to pod %v, container %v: '%v'", pod.Name, container.Name, err)
+	} else {
+		glog.V(5).Infof("Generating ref for container %s: %#v", container.Name, ref)
 	}
-	glog.Infof("Generating ref for container %s: %#v", container.Name, ref)

 	opts, err := dm.runtimeHelper.GenerateRunContainerOptions(pod, container, podIP)
 	if err != nil {