hold spawn on multi seq xtrigs

cylc · Feb 29, 2024 · 4c923d3 · 4c923d3
1 parent 217eb13
commit 4c923d3
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/cylc/flow/xtrigger_mgr.py b/cylc/flow/xtrigger_mgr.py
@@ -557,7 +557,7 @@ def call_xtriggers_async(self, itask: 'TaskProxy'):
                     self.data_store_mgr.delta_task_xtrigger(sig, True)
                     self.workflow_db_mgr.put_xtriggers({sig: {}})
                     LOG.info('xtrigger satisfied: %s = %s', label, sig)
-                    if itask.is_xtrigger_sequential:
+                    if self.all_task_seq_xtriggers_satisfied(itask):
                         self.sequential_spawn_next.add(itask.identity)
                     self.do_housekeeping = True
                 continue
@@ -577,7 +577,7 @@ def call_xtriggers_async(self, itask: 'TaskProxy'):
                             [itask.tdef.name],
                             xtrigger_env
                         )
-                    if itask.is_xtrigger_sequential:
+                    if self.all_task_seq_xtriggers_satisfied(itask):
                         self.sequential_spawn_next.add(itask.identity)
                 continue
 
@@ -610,6 +610,14 @@ def housekeep(self, itasks):
                 del self.sat_xtrig[sig]
         self.do_housekeeping = False
 
+    def all_task_seq_xtriggers_satisfied(self, itask: 'TaskProxy') -> bool:
+        """Check if all sequential xtriggers are satisfied for a task."""
+        return itask.is_xtrigger_sequential and all(
+            itask.state.xtriggers[label]
+            for label in itask.state.xtriggers
+            if label in self.sequential_xtrigger_labels
+        )
+
     def callback(self, ctx: 'SubFuncContext'):
         """Callback for asynchronous xtrigger functions.