Skip to content

Fix small xtrigger housekeeping bug. #7026

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix small xtrigger housekeeping bug. #7026

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8ba58a
Tweak xtrigger logging.
hjoliver Oct 9, 2025
c57c166
Add to xtrigger tests.
hjoliver Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes.d/7026.fix.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Log (re)commencement of xtrigger calls, for old xtriggers.
4 changes: 4 additions & 0 deletions cylc/flow/xtrigger_mgr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,6 +711,7 @@ def call_xtriggers_async(self, itask: 'TaskProxy'):
# General case: potentially slow asynchronous function call.
if sig in self.sat_xtrig:
# Already satisfied, just update the task
LOG.info(f"[{itask}] satisfying xtrigger prerequisite: {sig}")
Copy link
Member Author

@hjoliver hjoliver Oct 10, 2025

Choose a reason for hiding this comment

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

IMO we should log this as INFO, as confirmation that an xtrigger prerequisite is being satisfied by an existing xtrigger result.

if not itask.state.xtriggers[label]:
itask.state.xtriggers[label] = True
res = {}
Expand Down Expand Up @@ -760,7 +761,10 @@ def housekeep(self, itasks):
itask, sigs_only=True, unsat_only=True)
for sig in list(self.sat_xtrig):
if sig not in all_xtrig:
LOG.debug(f"Housekeeping xtrigger result: {sig}")
del self.sat_xtrig[sig]
with suppress(KeyError):
del self.t_next_call[sig]
Copy link
Member Author

@hjoliver hjoliver Oct 10, 2025

Choose a reason for hiding this comment

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

This is the bug fix.

self.do_housekeeping = False

def all_task_seq_xtriggers_satisfied(self, itask: 'TaskProxy') -> bool:
Expand Down
Loading