Skip to content

Commit

Permalink
Fix no-submission retry delays bug.
Browse files Browse the repository at this point in the history
  • Loading branch information
wxtim committed Jan 17, 2024
1 parent 42715c7 commit d4514f4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions cylc/flow/task_events_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,6 @@ def _process_message_check(

if (
itask.state(TASK_STATUS_WAITING)
and itask.tdef.run_mode == 'live'
and
(
(
Expand All @@ -804,13 +803,13 @@ def _process_message_check(
f"[{itask}] "
f"{self.FLAG_RECEIVED_IGNORED}{message}{timestamp}"
)

else:
return False

Check warning on line 806 in cylc/flow/task_events_mgr.py

View check run for this annotation

Codecov / codecov/patch

cylc/flow/task_events_mgr.py#L806

Added line #L806 was not covered by tests
elif flag == self.FLAG_POLLED_IGNORED:
LOG.warning(
f"[{itask}] "
f"{self.FLAG_POLLED_IGNORED}{message}{timestamp}"
)
return False
return False

Check warning on line 812 in cylc/flow/task_events_mgr.py

View check run for this annotation

Codecov / codecov/patch

cylc/flow/task_events_mgr.py#L812

Added line #L812 was not covered by tests

severity = cast(int, LOG_LEVELS.get(severity, INFO))
# Demote log level to DEBUG if this is a message that duplicates what
Expand Down
4 changes: 2 additions & 2 deletions cylc/flow/task_job_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -979,8 +979,8 @@ def _set_retry_timers(
rtconfig = itask.tdef.rtconfig

submit_delays = (
rtconfig['submission retry delays']
or itask.platform['submission retry delays']
rtconfig.get('submission retry delays', [])
or itask.platform.get('submission retry delays', [])
)

for key, delays in [
Expand Down

0 comments on commit d4514f4

Please sign in to comment.