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.

Sign up for GitHub

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

Jump to bottom

Preparing vs active #4668

Merged
merged 2 commits into from
Feb 10, 2022
Merged

Preparing vs active #4668

merged 2 commits into from
Feb 10, 2022

Conversation

oliver-sanders
Copy link
Member

@oliver-sanders oliver-sanders commented Feb 9, 2022 •
edited
Loading

Built on #4667

Found three instances where TASK_STATUS_PREPARING might be missing from a TASK_STATUSES_ACTIVE state check.

If we agree the check should be extended I'll add a test to enforce it.

Requirements 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.
  • Appropriate tests are included (unit and/or functional).
  • Logging change only - no changelog.
  • No documentation update required.

@oliver-sanders oliver-sanders added the question Flag this as a question for the next Cylc project meeting. label Feb 9, 2022
@oliver-sanders oliver-sanders added this to the cylc-8.0rc2 milestone Feb 9, 2022
@oliver-sanders oliver-sanders self-assigned this Feb 9, 2022
oliver-sanders
oliver-sanders commented Feb 9, 2022
View reviewed changes
cylc/flow/scheduler.py Outdated Show resolved Hide resolved
oliver-sanders
oliver-sanders commented Feb 9, 2022
View reviewed changes
cylc/flow/task_pool.py
@@ -822,7 +822,7 @@ def reload_taskdefs(self) -> None:
itask.copy_to_reload_successor(new_task)
self._swap_out(new_task)
LOG.info(f"[{itask}] reloaded task definition")
if itask.state(*TASK_STATUSES_ACTIVE):
if itask.state(*TASK_STATUSES_ACTIVE, TASK_STATUS_PREPARING):
Copy link
Member Author

Choose a reason for hiding this comment

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

We should warn for preparing tasks as pre-reload settings may have been baked into the filesystem?

Copy link
Member

Choose a reason for hiding this comment

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

👍

oliver-sanders
oliver-sanders commented Feb 9, 2022
View reviewed changes
cylc/flow/task_pool.py Outdated Show resolved Hide resolved
@oliver-sanders oliver-sanders added the bug? Not sure if this is a bug or not label Feb 9, 2022
hjoliver
hjoliver requested changes Feb 10, 2022
View reviewed changes
Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

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

IMO, 1/3 good, 2/3 not needed.

@oliver-sanders oliver-sanders removed question Flag this as a question for the next Cylc project meeting. bug? Not sure if this is a bug or not labels Feb 10, 2022
hjoliver
hjoliver approved these changes Feb 10, 2022
View reviewed changes
Copy link
Member

@hjoliver hjoliver left a comment

Choose a reason for hiding this comment

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

Nice tests. One review will do for this.

@hjoliver hjoliver merged commit 631da28 into cylc:master Feb 10, 2022
@oliver-sanders oliver-sanders deleted the preparing-vs-active branch February 11, 2022 08:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hjoliver hjoliver hjoliver approved these changes

Assignees

@oliver-sanders oliver-sanders

Labels
None yet
Projects
None yet
Milestone
cylc-8.0rc1
Development

Successfully merging this pull request may close these issues.
2 participants
@oliver-sanders @hjoliver