Skip to content

Commit 3bae035

Browse files
committed
Response to review.
Fix no-submission retry delays bug. undo unecessary thing add get methods to allow for lack of default submission time limit clarify the changelog entry
1 parent 79712dc commit 3bae035

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

changes.d/fix.5712.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Fixed a bug preventing simulation of task retries if job submission unset.
1+
Fixed a bug preventing simulation of task retries if `submission retry delays` unset.

cylc/flow/task_events_mgr.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,6 @@ def _process_message_check(
778778

779779
if (
780780
itask.state(TASK_STATUS_WAITING)
781-
and itask.tdef.run_mode == 'live'
782781
and
783782
(
784783
(
@@ -804,13 +803,13 @@ def _process_message_check(
804803
f"[{itask}] "
805804
f"{self.FLAG_RECEIVED_IGNORED}{message}{timestamp}"
806805
)
807-
808-
else:
806+
return False
807+
elif flag == self.FLAG_POLLED_IGNORED:
809808
LOG.warning(
810809
f"[{itask}] "
811810
f"{self.FLAG_POLLED_IGNORED}{message}{timestamp}"
812811
)
813-
return False
812+
return False
814813

815814
severity = cast(int, LOG_LEVELS.get(severity, INFO))
816815
# Demote log level to DEBUG if this is a message that duplicates what

cylc/flow/task_job_mgr.py

+3-6
Original file line numberDiff line numberDiff line change
@@ -979,8 +979,8 @@ def _set_retry_timers(
979979
rtconfig = itask.tdef.rtconfig
980980

981981
submit_delays = (
982-
rtconfig['submission retry delays']
983-
or itask.platform['submission retry delays']
982+
rtconfig.get('submission retry delays', [])
983+
or itask.platform.get('submission retry delays', [])
984984
)
985985

986986
for key, delays in [
@@ -1000,10 +1000,7 @@ def _simulation_submit_task_jobs(self, itasks, workflow):
10001000
itask.waiting_on_job_prep = False
10011001
itask.submit_num += 1
10021002
self._set_retry_timers(itask)
1003-
itask.platform = {
1004-
'name': 'SIMULATION',
1005-
'submission retry delays': [1]
1006-
}
1003+
itask.platform = {'name': 'SIMULATION'}
10071004
itask.summary['job_runner_name'] = 'SIMULATION'
10081005
itask.summary[self.KEY_EXECUTE_TIME_LIMIT] = (
10091006
itask.tdef.rtconfig['job']['simulated run length']

0 commit comments

Comments
 (0)