From c1c85a6c5f25a29f285c1fd6228080a3906f6405 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Fri, 22 Jul 2016 05:01:38 -0400 Subject: [PATCH] Log more info of container for debugging. --- pkg/kubelet/dockertools/docker_manager.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/dockertools/docker_manager.go b/pkg/kubelet/dockertools/docker_manager.go index 8cef3c234cc..9173a446715 100644 --- a/pkg/kubelet/dockertools/docker_manager.go +++ b/pkg/kubelet/dockertools/docker_manager.go @@ -693,7 +693,7 @@ func (dm *DockerManager) runContainer( securityContextProvider.ModifyHostConfig(pod, container, dockerOpts.HostConfig) createResp, err := dm.client.CreateContainer(dockerOpts) if err != nil { - dm.recorder.Eventf(ref, api.EventTypeWarning, events.FailedToCreateContainer, "Failed to create docker container with error: %v", err) + dm.recorder.Eventf(ref, api.EventTypeWarning, events.FailedToCreateContainer, "Failed to create docker container %q of pod %q with error: %v", container.Name, format.Pod(pod), err) return kubecontainer.ContainerID{}, err } if len(createResp.Warnings) != 0 { @@ -774,7 +774,7 @@ func (dm *DockerManager) GetContainers(all bool) ([]*kubecontainer.Container, er for _, c := range containers { converted, err := toRuntimeContainer(c) if err != nil { - glog.Errorf("Error examining the container: %v", err) + glog.Errorf("Error examining the container %v: %v", c.ID, err) continue } result = append(result, converted) @@ -799,13 +799,13 @@ func (dm *DockerManager) GetPods(all bool) ([]*kubecontainer.Pod, error) { for _, c := range containers { converted, err := toRuntimeContainer(c) if err != nil { - glog.Errorf("Error examining the container: %v", err) + glog.Errorf("Error examining the container %v: %v", c.ID, err) continue } podUID, podName, podNamespace, err := getPodInfoFromContainer(c) if err != nil { - glog.Errorf("Error examining the container: %v", err) + glog.Errorf("Error examining the container %v: %v", c.ID, err) continue } @@ -1275,7 +1275,7 @@ func (dm *DockerManager) killPodWithSyncResult(pod *api.Pod, runningPod kubecont err := dm.KillContainerInPod(container.ID, containerSpec, pod, "Need to kill pod.", gracePeriodOverride) if err != nil { killContainerResult.Fail(kubecontainer.ErrKillContainer, err.Error()) - glog.Errorf("Failed to delete container: %v; Skipping pod %q", err, runningPod.ID) + glog.Errorf("Failed to delete container %v: %v; Skipping pod %q", container.ID.ID, err, runningPod.ID) } containerResults <- killContainerResult }(container) @@ -1307,7 +1307,7 @@ func (dm *DockerManager) killPodWithSyncResult(pod *api.Pod, runningPod kubecont result.AddSyncResult(killContainerResult) if err := dm.KillContainerInPod(networkContainer.ID, networkSpec, pod, "Need to kill pod.", gracePeriodOverride); err != nil { killContainerResult.Fail(kubecontainer.ErrKillContainer, err.Error()) - glog.Errorf("Failed to delete container: %v; Skipping pod %q", err, runningPod.ID) + glog.Errorf("Failed to delete container %v: %v; Skipping pod %q", networkContainer.ID.ID, err, runningPod.ID) } } return