-
Notifications
You must be signed in to change notification settings - Fork 93
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
Spawn parentless sequential xtriggered task on set outputs #6448
Spawn parentless sequential xtriggered task on set outputs #6448
Conversation
Will add a test (or add to existing). |
cylc/flow/task_pool.py
Outdated
# Task may be set running before xtrigger is satisfied, | ||
# if so check/spawn if xtrigger sequential. | ||
elif ( | ||
itask.is_xtrigger_sequential | ||
and ( | ||
itask.identity not in | ||
self.xtrigger_mgr.sequential_has_spawned_next | ||
) | ||
): | ||
self.xtrigger_mgr.sequential_has_spawned_next.add( | ||
itask.identity | ||
) | ||
self.spawn_to_rh_limit( | ||
itask.tdef, | ||
itask.tdef.next_point(itask.point), | ||
itask.flow_nums | ||
) | ||
else: | ||
# Task may be set running before xtrigger is satisfied, | ||
# if so check/spawn if xtrigger sequential. | ||
self.check_spawn_psx_task(itask) | ||
# De-queue it to run now. | ||
self.task_queue_mgr.force_release_task(itask) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This has changed the logic - was it meant to? Or should it be
# Task may be set running before xtrigger is satisfied,
# if so check/spawn if xtrigger sequential.
elif not self.check_spawn_psx_task(itask):
# De-queue it to run now.
self.task_queue_mgr.force_release_task(itask)
(having changed check_spawn_psx_task
to return a boolean)?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, but I figured it was ok to de-queue and spawn (if psx) if not runahead released..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have changed it like you said... better to keep them separate I suppose, since they are different category of action..
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, strike that .. This is a force trigger .. PSX tasks should be spawned outside of this runahead/de-queue here.. So have put this outside and after the if/else block.
34ce7b3
to
f50b365
Compare
f50b365
to
edd8c86
Compare
edd8c86
to
d08137b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(From a very quick review and test - I ran out of time today, sorry - it looks good)
closes #6447
Check List
CONTRIBUTING.md
and added my name as a Code Contributor.setup.cfg
(andconda-environment.yml
if present).?.?.x
branch.