Update unexpected errror status conditions (#1811)

vishalbollu · web-flow · commit f968a1e2f9fd · 2021-01-20T14:51:41.000-05:00
diff --git a/pkg/operator/resources/job/batchapi/cron.go b/pkg/operator/resources/job/batchapi/cron.go
@@ -390,7 +390,7 @@ func checkForJobFailure(jobKey spec.JobKey, k8sJob *kbatch.Job) (bool, error) {
 			job.SetWorkerErrorStatus(jobKey),
 			deleteJobRuntimeResources(jobKey),
 		)
-	} else if int(k8sJob.Status.Succeeded) == 1 && len(pods) == 0 {
+	} else if int(k8sJob.Status.Active) == 0 && int(k8sJob.Status.Failed) == 0 && len(pods) == 0 {
 		// really unexpected situation which doesn't hurt if we check
 		return true, errors.FirstError(
 			job.SetUnexpectedErrorStatus(jobKey),
diff --git a/pkg/operator/resources/job/taskapi/cron.go b/pkg/operator/resources/job/taskapi/cron.go
@@ -221,7 +221,7 @@ func checkIfJobCompleted(jobKey spec.JobKey, k8sJob *kbatch.Job) error {
 			job.SetSucceededStatus(jobKey),
 			deleteJobRuntimeResources(jobKey),
 		)
-	} else if int(k8sJob.Status.Succeeded) == 1 && len(pods) == 0 {
+	} else if int(k8sJob.Status.Active) == 0 && int(k8sJob.Status.Failed) == 0 && len(pods) == 0 {
 		// really unexpected situation which doesn't hurt if we check
 		return errors.FirstError(
 			job.SetUnexpectedErrorStatus(jobKey),

Original file line number	Diff line number	Diff line change
`@@ -390,7 +390,7 @@ func checkForJobFailure(jobKey spec.JobKey, k8sJob *kbatch.Job) (bool, error) {`
`390`	`390`	`job.SetWorkerErrorStatus(jobKey),`
`391`	`391`	`deleteJobRuntimeResources(jobKey),`
`392`	`392`	`)`
`393`		`- } else if int(k8sJob.Status.Succeeded) == 1 && len(pods) == 0 {`
	`393`	`+ } else if int(k8sJob.Status.Active) == 0 && int(k8sJob.Status.Failed) == 0 && len(pods) == 0 {`
`394`	`394`	`// really unexpected situation which doesn't hurt if we check`
`395`	`395`	`return true, errors.FirstError(`
`396`	`396`	`job.SetUnexpectedErrorStatus(jobKey),`
Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ func checkIfJobCompleted(jobKey spec.JobKey, k8sJob *kbatch.Job) error {`
`221`	`221`	`job.SetSucceededStatus(jobKey),`
`222`	`222`	`deleteJobRuntimeResources(jobKey),`
`223`	`223`	`)`
`224`		`- } else if int(k8sJob.Status.Succeeded) == 1 && len(pods) == 0 {`
	`224`	`+ } else if int(k8sJob.Status.Active) == 0 && int(k8sJob.Status.Failed) == 0 && len(pods) == 0 {`
`225`	`225`	`// really unexpected situation which doesn't hurt if we check`
`226`	`226`	`return errors.FirstError(`
`227`	`227`	`job.SetUnexpectedErrorStatus(jobKey),`