Merge pull request #337 from wangyuqing4/panic

fix ExitCode panic
volcano-sh · Jul 15, 2019 · afb0007 · afb0007
2 parents 57473f8 + 02b8436
commit afb0007
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/pkg/controllers/job/job_controller_handler.go b/pkg/controllers/job/job_controller_handler.go
@@ -234,7 +234,9 @@ func (cc *Controller) updatePod(oldObj, newObj interface{}) {
 		event = vkbatchv1.PodFailedEvent
 		// TODO: currently only one container pod is supported by volcano
 		// Once multi containers pod is supported, update accordingly.
-		exitCode = newPod.Status.ContainerStatuses[0].State.Terminated.ExitCode
+		if len(newPod.Status.ContainerStatuses) > 0 && newPod.Status.ContainerStatuses[0].State.Terminated != nil {
+			exitCode = newPod.Status.ContainerStatuses[0].State.Terminated.ExitCode
+		}
 	}
 
 	if oldPod.Status.Phase != v1.PodSucceeded &&

diff --git a/pkg/controllers/job/job_controller_handler_test.go b/pkg/controllers/job/job_controller_handler_test.go
@@ -365,6 +365,23 @@ func TestUpdatePodFunc(t *testing.T) {
 			},
 			ExpectedValue: v1.PodRunning,
 		},
+		{
+			Name: "UpdatePod Failed case",
+			Job: &vkbatchv1.Job{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "job1",
+					Namespace: namespace,
+				},
+			},
+			oldPod: buildPod(namespace, "pod1", v1.PodPending, nil),
+			newPod: buildPod(namespace, "pod1", v1.PodFailed, nil),
+			Annotation: map[string]string{
+				vkbatchv1.JobNameKey:  "job1",
+				vkbatchv1.JobVersion:  "0",
+				vkbatchv1.TaskSpecKey: "task1",
+			},
+			ExpectedValue: v1.PodFailed,
+		},
 	}
 
 	for i, testcase := range testcases {