Skip to content

fix ExitCode panic #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
volcano-sh-bot merged 1 commit into from
Jul 15, 2019
Merged

fix ExitCode panic #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/controllers/job/job_controller_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand Down
17 changes: 17 additions & 0 deletions pkg/controllers/job/job_controller_handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down