github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Add pod name to error message when getting logs of a container

Browse Source
This commit is contained in:
feihujiang 2015-09-07 14:28:26 +08:00
parent 8cc75a4734
commit d713826aa9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubelet/kubelet.go
View File

@ -2050,11 +2050,11 @@ func (kl *Kubelet) validateContainerStatus(podStatus *api.PodStatus, containerNa
cStatus, found := api.GetContainerStatus(podStatus.ContainerStatuses, containerName) cStatus, found := api.GetContainerStatus(podStatus.ContainerStatuses, containerName)
if !found { if !found {
return "", fmt.Errorf("container %q not found in pod", containerName) return "", fmt.Errorf("container %q not found", containerName)
} }
if previous { if previous {
if cStatus.LastTerminationState.Terminated == nil { if cStatus.LastTerminationState.Terminated == nil {
return "", fmt.Errorf("previous terminated container %q not found in pod", containerName) return "", fmt.Errorf("previous terminated container %q not found", containerName)
} }
cID = cStatus.LastTerminationState.Terminated.ContainerID cID = cStatus.LastTerminationState.Terminated.ContainerID
} else { } else {
@ -2081,23 +2081,23 @@ func (kl *Kubelet) GetKubeletContainerLogs(podFullName, containerName, tail stri
pod, ok := kl.GetPodByName(namespace, name) pod, ok := kl.GetPodByName(namespace, name)
if !ok { if !ok {
return fmt.Errorf("unable to get logs for container %q in pod %q: unable to find pod", containerName, podFullName) return fmt.Errorf("unable to get logs for container %q in pod %q namespace %q: unable to find pod", containerName, name, namespace)
} }
podStatus, found := kl.statusManager.GetPodStatus(pod.UID) podStatus, found := kl.statusManager.GetPodStatus(pod.UID)
if !found { if !found {
return fmt.Errorf("failed to get status for pod %q", podFullName) return fmt.Errorf("failed to get status for pod %q in namespace %q", name, namespace)
} }
if err := kl.validatePodPhase(&podStatus); err != nil { if err := kl.validatePodPhase(&podStatus); err != nil {
// No log is available if pod is not in a "known" phase (e.g. Unknown). // No log is available if pod is not in a "known" phase (e.g. Unknown).
return err return fmt.Errorf("Pod %q in namespace %q : %v", name, namespace, err)
} }
containerID, err := kl.validateContainerStatus(&podStatus, containerName, previous) containerID, err := kl.validateContainerStatus(&podStatus, containerName, previous)
if err != nil { if err != nil {
// No log is available if the container status is missing or is in the // No log is available if the container status is missing or is in the
// waiting state. // waiting state.
return err return fmt.Errorf("Pod %q in namespace %q: %v", name, namespace, err)
} }
return kl.containerRuntime.GetContainerLogs(pod, containerID, tail, follow, stdout, stderr) return kl.containerRuntime.GetContainerLogs(pod, containerID, tail, follow, stdout, stderr)
} }