Skip to content

Fix Google Batch exit code when spot claim is successfully retried #6926

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
bentsherman merged 2 commits into from
Mar 17, 2026
Merged

Fix Google Batch exit code when spot claim is successfully retried #6926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2e8d2
fixes exit code when spot claim and succeeded autoretry (maxSpotAttem…
jorgee Mar 16, 2026
a0cb6e3
Merge branch 'master' into 6779-nextflow-prioritizes-50001-over-exitc…
bentsherman Mar 17, 2026
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: 4 additions & 0 deletions plugins/nf-google/src/main/nextflow/cloud/google/batch/GoogleBatchTaskHandler.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,10 @@ class GoogleBatchTaskHandler extends TaskHandler implements FusionAwareTask {
task.stderr = executor.logging.stderr(uid, taskId) ?: errorFile
}
else {
// Retried spot instances could keep the 500xx exit code event when the automatic retied succeeds. In this case, we need to read the exit code from .exitcode
// https://github.com/nextflow-io/nextflow/issues/6779
if( task.exitStatus >= 50000 )
task.exitStatus = readExitFile()
task.stdout = outputFile
task.stderr = errorFile
}
Expand Down
12 changes: 7 additions & 5 deletions plugins/nf-google/src/test/nextflow/cloud/google/batch/GoogleBatchTaskHandlerTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ class GoogleBatchTaskHandlerTest extends Specification {
def client = Mock(BatchClient){
getTaskInArrayStatus(jobId, taskId) >> { TASK_STATE ? makeTaskStatus(TASK_STATE, DESC, EXIT_CODE): null }
getTaskStatus(jobId, taskId) >> { TASK_STATE ? makeTaskStatus(TASK_STATE, DESC, EXIT_CODE): null }
getJobStatus(jobId ) >> makeJobStatus(JobStatus.State.FAILED,DESC)
getJobStatus(jobId ) >> makeJobStatus(JOB_STATE,DESC)
}
def logging = Mock(BatchLogging)
def executor = Mock(GoogleBatchExecutor){
Expand All @@ -808,16 +808,18 @@ class GoogleBatchTaskHandlerTest extends Specification {
when:
def result = handler.checkIfCompleted()
then:
0 * handler.readExitFile() >> EXIT_STATUS
NUM_READ_EXIT * handler.readExitFile() >> EXIT_STATUS
handler.status == TASK_STATUS
handler.task.exitStatus == EXIT_STATUS
handler.task.error?.message == TASK_ERROR
result == RESULT

where:
TASK_STATE | DESC | EXIT_CODE | ARRAY_CHILD | TASK_STATUS | EXIT_STATUS | RESULT | TASK_ERROR
TaskStatus.State.FAILED | 'Task failed due to Spot VM preemption with exit code 50001.' | 50001 | true | nextflow.processor.TaskStatus.COMPLETED | 50001 | true | 'Task failed due to Spot VM preemption with exit code 50001.'
TaskStatus.State.FAILED | 'Task failed due to Spot VM preemption with exit code 50001.' | 50001 | false | nextflow.processor.TaskStatus.COMPLETED | 50001 | true | 'Task failed due to Spot VM preemption with exit code 50001.'
TASK_STATE | JOB_STATE | NUM_READ_EXIT | DESC | EXIT_CODE | ARRAY_CHILD | TASK_STATUS | EXIT_STATUS | RESULT | TASK_ERROR
TaskStatus.State.FAILED | JobStatus.State.FAILED | 0 | 'Task failed due to Spot VM preemption with exit code 50001.' | 50001 | true | nextflow.processor.TaskStatus.COMPLETED | 50001 | true | 'Task failed due to Spot VM preemption with exit code 50001.'
TaskStatus.State.FAILED | JobStatus.State.FAILED | 0 | 'Task failed due to Spot VM preemption with exit code 50001.' | 50001 | false | nextflow.processor.TaskStatus.COMPLETED | 50001 | true | 'Task failed due to Spot VM preemption with exit code 50001.'
TaskStatus.State.SUCCEEDED | JobStatus.State.SUCCEEDED | 1 | null | 50001 | true | nextflow.processor.TaskStatus.COMPLETED | 0 | true | null
TaskStatus.State.SUCCEEDED | JobStatus.State.SUCCEEDED | 1 | null | 50001 | false | nextflow.processor.TaskStatus.COMPLETED | 0 | true | null
}

StatusEvent makeStatusEventWithTime(long seconds, Integer exitCode) {
Expand Down
Loading
⚡