Skip to content

Commit f17c360

Browse files
committed
Implement group trigger.
1 parent d4edafa commit f17c360

File tree

13 files changed

+189
-84
lines changed

13 files changed

+189
-84
lines changed

cylc/flow/flow_mgr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def get_flow_num(
160160

161161
if flow_num in self.flows:
162162
if meta is not None:
163-
LOG.warning(
163+
LOG.debug(
164164
f'Ignoring flow metadata "{meta}":'
165165
f' {flow_num} is not a new flow'
166166
)

cylc/flow/prerequisite.py

+7
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,13 @@ def __init__(self, point: 'PointBase'):
123123
# * `False` (prerequisite unsatisfied).
124124
self._cached_satisfied: Optional[bool] = None
125125

126+
def dump(self):
127+
print(f"POINT {self.point}")
128+
for k, v in self._satisfied.items():
129+
print(f"_SAT: {k}, {v}")
130+
print(f"COND: {self.conditional_expression}")
131+
print(f"ALL SAT: {self._all_satisfied}")
132+
126133
def instantaneous_hash(self) -> int:
127134
"""Generate a hash of this prerequisite in its current state.
128135

cylc/flow/scheduler.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -1546,10 +1546,14 @@ def start_job_submission(self, itasks: 'Iterable[TaskProxy]') -> bool:
15461546
flow = ','.join(str(i) for i in itask.flow_nums)
15471547
else:
15481548
flow = FLOW_NONE
1549-
log(
1550-
f"{itask.identity} -triggered off "
1551-
f"{itask.state.get_resolved_dependencies()} in flow {flow}"
1552-
)
1549+
if itask.is_manual_submit:
1550+
off = f"[] in flow {flow}"
1551+
else:
1552+
off = (
1553+
f"{itask.state.get_resolved_dependencies()}"
1554+
f" in flow {flow}"
1555+
)
1556+
log(f"{itask.identity} -triggered off {off}")
15531557

15541558
# one or more tasks were passed through the submission pipeline
15551559
return True

cylc/flow/task_job_mgr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ def submit_livelike_task_jobs(
469469
'platform_name': itask.platform['name'],
470470
'job_runner_name': itask.summary['job_runner_name'],
471471
})
472-
472+
# reset the is_manual_submit flag in case of retries
473473
itask.is_manual_submit = False
474474

475475
if ri_map[install_target] == REMOTE_FILE_INSTALL_255:

0 commit comments

Comments
 (0)