From 728d089c18ca2587a55edeeb9e4aef4cc842da36 Mon Sep 17 00:00:00 2001
From: qiagu <guqiang01@gmail.com>
Date: Tue, 21 Jun 2022 11:22:21 -0700
Subject: [PATCH] Allow retry action to be exit

---
 lib/galaxy/config/sample/job_conf.xml.sample_advanced | 1 +
 lib/galaxy/jobs/runners/aws.py                        | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/config/sample/job_conf.xml.sample_advanced b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
index e6acf70e9b9..9ac22fcd378 100644
--- a/lib/galaxy/config/sample/job_conf.xml.sample_advanced
+++ b/lib/galaxy/config/sample/job_conf.xml.sample_advanced
@@ -1157,6 +1157,7 @@
             <param id="retry_on_exit_statusReason">...</param>
             <param id="retry_on_exit_reason">...</param>
             <param id="retry_on_exit_exitCode">...</param>
+            <param id="retry_on_exit_action">exit</param>
             -->
         </destination>
         <destination id="aws_batch_gpu" runner="aws_batch">
diff --git a/lib/galaxy/jobs/runners/aws.py b/lib/galaxy/jobs/runners/aws.py
index 1bdc122b8f1..3defa7f3f9d 100644
--- a/lib/galaxy/jobs/runners/aws.py
+++ b/lib/galaxy/jobs/runners/aws.py
@@ -179,6 +179,10 @@ class AWSBatchJobRunner(AsynchronousJobRunner):
             "default": "",
             "map": str,
         },
+        "retry_on_exit_action": {
+            "default": "RETRY",
+            "map": str,
+        },
     }
 
     FARGATE_VCPUS = [0.25, 0.5, 1, 2, 4]
@@ -293,18 +297,19 @@ class AWSBatchJobRunner(AsynchronousJobRunner):
     def _get_retry_strategy(self, destination_params):
         """ Make a simple one-condition retry strategy
         """
-        # TODO make multiple-condition retry strategies
+        # TODO make multi-condition retry strategies
         attemps = destination_params.get("retry_attempts")
         status_reason = destination_params.get("retry_on_exit_statusReason")
         reason = destination_params.get("retry_on_exit_reason")
         exit_code = destination_params.get("retry_on_exit_exitCode")
+        action = destination_params.get("retry_on_exit_action")
 
         if attemps <= 1:
             return
 
         strategy = {
             "attempts": attemps,
-            "evaluateOnExit": [{"action": "RETRY"}],
+            "evaluateOnExit": [{"action": action}],
         }
         if status_reason:
             strategy["evaluateOnExit"][0]["onStatusReason"] = status_reason