From 0c31d001f7100d44a3d7f3d5847ab7a1bd45b26d Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Fri, 3 Apr 2026 11:40:44 +0200 Subject: [PATCH] Don't retry JobNotReadyException in job destination mapping JobNotReadyException means "try again later", not "there's an error with the rule". The generic except Exception retry logic in __handle_rule was catching it and retrying without resource params, which is nonsensical for this exception type. Let it propagate immediately so it's properly caught by __verify_job_ready. Fixes GALAXY-MAIN-4KSCZZZ0015CV --- lib/galaxy/jobs/mapper.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/galaxy/jobs/mapper.py b/lib/galaxy/jobs/mapper.py index 2684b0da492..ce6ccea0efb 100644 --- a/lib/galaxy/jobs/mapper.py +++ b/lib/galaxy/jobs/mapper.py @@ -227,6 +227,8 @@ class JobRunnerMapper: def __handle_rule(self, rule_function: Callable, destination: JobDestination) -> JobDestination: try: job_destination = self.__invoke_expand_function(rule_function, destination) + except JobNotReadyException: + raise except Exception as e: # Rules have varying quality and don't raise a consistent set of standard exceptions. # so ... if we get an error here let's try again without resource params encoded