From 4e218f224f228c21b7763a56f9c41fa89c2e276a Mon Sep 17 00:00:00 2001
From: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
Date: Sat, 13 Jul 2024 16:14:48 +0200
Subject: [PATCH] Fix Prevent AwS Batch retry the job execution when the
 container does not exist

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
---
 .../nextflow/cloud/aws/batch/AwsBatchTaskHandler.groovy     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchTaskHandler.groovy b/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchTaskHandler.groovy
index 15c356cb69..87787caf6e 100644
--- a/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchTaskHandler.groovy
+++ b/plugins/nf-amazon/src/main/nextflow/cloud/aws/batch/AwsBatchTaskHandler.groovy
@@ -62,6 +62,7 @@ import groovy.util.logging.Slf4j
 import nextflow.BuildInfo
 import nextflow.cloud.types.CloudMachineInfo
 import nextflow.container.ContainerNameValidator
+import nextflow.exception.ProcessException
 import nextflow.exception.ProcessSubmitException
 import nextflow.exception.ProcessUnrecoverableException
 import nextflow.executor.BashWrapperBuilder
@@ -267,7 +268,10 @@ class AwsBatchTaskHandler extends TaskHandler implements BatchHandler<String,Job
             // finalize the task
             task.stdout = outputFile
             if( job?.status == 'FAILED' || task.exitStatus==Integer.MAX_VALUE ) {
-                task.error = new ProcessUnrecoverableException(errReason(job))
+                final reason = errReason(job)
+                // retry all CannotPullContainer errors apart when it does not exist or cannot be accessed
+                final unrecoverable = reason.contains('CannotPullContainer') && reason.contains('unauthorized')
+                task.error = unrecoverable ? new ProcessUnrecoverableException(reason) : new ProcessException(reason)
                 task.stderr = executor.getJobOutputStream(jobId) ?: errorFile
             }
             else {