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

Group trigger #6395

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cylc/flow/flow_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def get_flow_num(

if flow_num in self.flows:
if meta is not None:
LOG.warning(
LOG.debug(
f'Ignoring flow metadata "{meta}":'
f' {flow_num} is not a new flow'
)
Expand Down
7 changes: 7 additions & 0 deletions cylc/flow/prerequisite.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
# * `False` (prerequisite unsatisfied).
self._all_satisfied: Optional[bool] = None

def dump(self):
print(f"POINT {self.point}")

Check warning on line 124 in cylc/flow/prerequisite.py

View check run for this annotation

Codecov / codecov/patch

cylc/flow/prerequisite.py#L124

Added line #L124 was not covered by tests
for k, v in self._satisfied.items():
print(f"_SAT: {k}, {v}")
print(f"COND: {self.conditional_expression}")
print(f"ALL SAT: {self._all_satisfied}")

Check warning on line 128 in cylc/flow/prerequisite.py

View check run for this annotation

Codecov / codecov/patch

cylc/flow/prerequisite.py#L126-L128

Added lines #L126 - L128 were not covered by tests

def instantaneous_hash(self) -> int:
"""Generate a hash of this prerequisite in its current state.

Expand Down
12 changes: 8 additions & 4 deletions cylc/flow/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -1275,10 +1275,14 @@ def release_queued_tasks(self) -> bool:
flow = ','.join(str(i) for i in itask.flow_nums)
else:
flow = FLOW_NONE
log(
f"{itask.identity} -triggered off "
f"{itask.state.get_resolved_dependencies()} in flow {flow}"
)
if itask.is_manual_submit:
off = f"[] in flow {flow}"
else:
off = (
f"{itask.state.get_resolved_dependencies()}"
f" in flow {flow}"
)
log(f"{itask.identity} -triggered off {off}")

# one or more tasks were passed through the submission pipeline
return True
Expand Down
3 changes: 2 additions & 1 deletion cylc/flow/task_job_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ def submit_task_jobs(self, workflow, itasks, curve_auth,
'platform_name': itask.platform['name'],
'job_runner_name': itask.summary['job_runner_name'],
})
itask.is_manual_submit = False

if ri_map[install_target] == REMOTE_FILE_INSTALL_255:
del ri_map[install_target]
Expand Down Expand Up @@ -1103,6 +1102,8 @@ def _submit_task_job_callback(self, workflow, itask, cmd_ctx, line):
self.task_events_mgr.process_message(
itask, CRITICAL, self.task_events_mgr.EVENT_SUBMIT_FAILED,
ctx.timestamp)
# Submitted, so reset the is_manual submit flag in case of retries.
itask.is_manual_submit = False

def _prep_submit_task_job(
self,
Expand Down
Loading
Loading