Merge pull request #59537 from hanxiaoshuai/fixtodo0208

Automatic merge from submit-queue (batch tested with PRs 61124, 59537, 61235, 61258, 61114). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix todo:add function getFailContainer to report which containers failed the pod **What this PR does / why we need it**: fix todo:add function getFailContainer to report which containers failed the pod in runonce.go **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #59537 from hanxiaoshuai/fixtodo0208
eda4fdb7 · Kubernetes Submit Queue · GitHub · d9d13646 · 1ddfe9c8 · eda4fdb7
Unverified Commit eda4fdb7 authored Mar 21, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 2 deletions

runonce.go pkg/kubelet/runonce.go +21 -2

No files found.
--- a/pkg/kubelet/runonce.go
+++ b/pkg/kubelet/runonce.go
@@ -91,8 +91,12 @@ func (kl *Kubelet) runOnce(pods []*v1.Pod, retryDelay time.Duration) (results []
 		res := <-ch
 		results = append(results, res)
 		if res.Err != nil {
-			// TODO(proppy): report which containers failed the pod.
+			faliedContainerName, err := kl.getFailedContainers(res.Pod)
-			glog.Infof("failed to start pod %q: %v", format.Pod(res.Pod), res.Err)
+			if err != nil {
+				glog.Infof("unable to get failed containers' names for pod %q, error:%v", format.Pod(res.Pod), err)
+			} else {
+				glog.Infof("unable to start pod %q because container:%v failed", format.Pod(res.Pod), faliedContainerName)
+			}
 			failedPods = append(failedPods, format.Pod(res.Pod))
 		} else {
 			glog.Infof("started pod %q", format.Pod(res.Pod))
@@ -156,3 +160,18 @@ func (kl *Kubelet) isPodRunning(pod *v1.Pod, status *kubecontainer.PodStatus) bo
 	}
 	return true
 }
+// getFailedContainer returns failed container name for pod.
+func (kl *Kubelet) getFailedContainers(pod *v1.Pod) ([]string, error) {
+	status, err := kl.containerRuntime.GetPodStatus(pod.UID, pod.Name, pod.Namespace)
+	if err != nil {
+		return nil, fmt.Errorf("unable to get status for pod %q: %v", format.Pod(pod), err)
+	}
+	var containerNames []string
+	for _, cs := range status.ContainerStatuses {
+		if cs.State != kubecontainer.ContainerStateRunning && cs.ExitCode != 0 {
+			containerNames = append(containerNames, cs.Name)
+		}
+	}
+	return containerNames, nil
+}