Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix execution time limit polling intervals [Cylc 7] #5751

Merged

Conversation

wxtim
Copy link
Member

@wxtim wxtim commented Oct 2, 2023

Fixes 2 bugs without issues reports.

  1. Backport of this fix - ticket contains a fuller explanation.
  2. Prevent task events manager modifying the list of execution time limit polling intervals in glbl_cfg, which was causing the first polling interval after the execution time limit to increment every time this code was run.

Check List

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg (and conda-environment.yml if present).
  • Tests are included - I've tested that this now produces more sensible output, but have not formally tested it.
  • CHANGES.md entry included if this is a change that can affect users
  • Cylc-Doc pull request opened if required at cylc/cylc-doc/pull/XXXX.
  • If this is a bug fix, PR should be raised against the relevant ?.?.x branch.

@wxtim wxtim self-assigned this Oct 2, 2023
@wxtim wxtim marked this pull request as draft October 2, 2023 09:55
@wxtim wxtim force-pushed the fix.execution_time_limit_polling_intervals branch 2 times, most recently from 5e0860b to 74ce932 Compare October 4, 2023 10:12
@wxtim wxtim force-pushed the fix.execution_time_limit_polling_intervals branch from 74ce932 to b6602d2 Compare October 4, 2023 10:15
@wxtim wxtim marked this pull request as ready for review October 4, 2023 10:15
@wxtim wxtim added this to the cylc-7.8.x milestone Oct 4, 2023
@wxtim wxtim changed the title Fix execution time limit polling intervals Fix execution time limit polling intervals [Cylc 7] Oct 4, 2023
lib/cylc/task_events_mgr.py Outdated Show resolved Hide resolved
lib/cylc/task_events_mgr.py Show resolved Hide resolved

# Total timeout after adding execution time limit polling
# intervals:
timeout = (time_limit + sum(time_limit_delays))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line seems to be missing from the Cylc 8 branch?

Copy link
Member Author

@wxtim wxtim Oct 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was removed here: #4863 - @dpmatthews is it sane to backport this change?

[edit]
Dave said yes on Teams

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, this bit is a change in behaviour rather than a bug fix. I suggest we leave it unchanged in Cylc 7.

Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2. Prevent task events manager modifying the list of execution time limit polling intervals in glbl_cfg, which was causing the first polling interval after the execution time limit to increment every time this code was run.

I'm not seeing how the changes here address this, could you explain?

lib/cylc/task_events_mgr.py Outdated Show resolved Hide resolved
lib/cylc/task_events_mgr.py Outdated Show resolved Hide resolved
lib/cylc/task_events_mgr.py Outdated Show resolved Hide resolved
wxtim and others added 2 commits October 17, 2023 08:24
Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
@wxtim
Copy link
Member Author

wxtim commented Oct 17, 2023

I'm not seeing how the changes here address this, could you explain?

No, because they don't. Good Spot. 🐆

@wxtim wxtim requested a review from MetRonnie October 17, 2023 08:36
@wxtim wxtim force-pushed the fix.execution_time_limit_polling_intervals branch from c548386 to e6efa26 Compare October 17, 2023 11:20
@wxtim wxtim requested a review from MetRonnie October 17, 2023 11:22
Copy link
Member

@MetRonnie MetRonnie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested out; fixes both bugs

@oliver-sanders oliver-sanders merged commit d6c40be into cylc:7.8.x Oct 26, 2023
@wxtim wxtim deleted the fix.execution_time_limit_polling_intervals branch October 26, 2023 12:26
@hjoliver hjoliver modified the milestones: cylc-7.8.x, 7.8.14 and 7.9.9 Jan 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants