Skip to content

Check sqs queue length before checking job status #1925

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
merged 1 commit into from
Mar 2, 2021
Merged

Check sqs queue length before checking job status #1925

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
24 changes: 10 additions & 14 deletions pkg/operator/resources/job/batchapi/cron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,28 +296,24 @@ func checkIfJobCompleted(jobState *job.State, queueURL string, k8sJob kbatch.Job
return err
}

// job is still in-progress
if int(k8sJob.Status.Active) != 0 {
return nil
}

queueMessages, err := getQueueMetricsFromURL(queueURL)
if err != nil {
return err
}

if !queueMessages.IsEmpty() {
// Give time for queue metrics to reach consistency
if _jobsToDelete.Has(jobKey.ID) {
_jobsToDelete.Remove(jobKey.ID)
jobLogger.Error("unexpected job status because cluster state indicates job has completed but metrics indicate that job is still in progress")
return errors.FirstError(
job.SetUnexpectedErrorStatus(jobKey),
deleteJobRuntimeResources(jobKey),
)
if int(k8sJob.Status.Active) == 0 {
if _jobsToDelete.Has(jobKey.ID) {
_jobsToDelete.Remove(jobKey.ID)
jobLogger.Error("unexpected job status because cluster state indicates job has completed but metrics indicate that job is still in progress")
return errors.FirstError(
job.SetUnexpectedErrorStatus(jobKey),
deleteJobRuntimeResources(jobKey),
)
}
_jobsToDelete.Add(jobKey.ID)
}
_jobsToDelete.Add(jobKey.ID)

return nil
}

Expand Down