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

expiry: prevent expired tasks from retrying automatically #6353

Merged
merged 1 commit into from
Sep 11, 2024

Conversation

oliver-sanders
Copy link
Member

Closes #6284

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 (or explain why tests are not needed).
  • Changelog 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.

@oliver-sanders oliver-sanders added the bug Something is wrong :( label Sep 3, 2024
@oliver-sanders oliver-sanders added this to the 8.3.4 milestone Sep 3, 2024
@oliver-sanders oliver-sanders self-assigned this Sep 3, 2024
@@ -2150,3 +2150,51 @@ async def test_trigger_unqueued(flow, scheduler, start):
assert not schd.pool.task_queue_mgr.force_released, (
"Triggering an unqueued task should not affect the force_released list"
)


@pytest.mark.parametrize('expire_type', ['clock-expire', 'manual'])
Copy link
Member Author

Choose a reason for hiding this comment

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

Manual expiry wasn't broken, but I included it in this test for completeness.

@@ -2239,6 +2239,7 @@ def clock_expire_tasks(self):
# check if this task is clock expired
and itask.clock_expire()
):
self.task_queue_mgr.remove_task(itask)
Copy link
Member

Choose a reason for hiding this comment

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

Damn, love an easy fix!

@hjoliver
Copy link
Member

hjoliver commented Sep 3, 2024

Technically this should have a change log entry (although I doubt many have run into the bug.)

@oliver-sanders oliver-sanders requested a review from wxtim September 4, 2024 08:52
@wxtim
Copy link
Member

wxtim commented Sep 4, 2024

on:testspass - will push button

@oliver-sanders
Copy link
Member Author

Tests passed, pressing the button.

@oliver-sanders oliver-sanders merged commit 2ec0cb3 into cylc:8.3.x Sep 11, 2024
27 checks passed
@oliver-sanders oliver-sanders deleted the 6284 branch September 11, 2024 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something is wrong :( small
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants