Merge pull request #6723 from cylc/8.4.x-sync

🤖 Merge 8.4.x-sync into master

Author: hjoliver

changes.d/6602.fix.md

@@ -0,0 +1 @@
+Fix a bug where suicide triggers could prevent initial cycle point tasks spawning.

cylc/flow/taskdef.py

@@ -99,9 +99,10 @@ def generate_graph_parents(
 ) -> Dict['SequenceBase', List[TaskTuple]]:
     """Determine concrete graph parents of task tdef at point.
 
-    Infer parents be reversing upstream triggers that lead to point/task.
+    Infer parents by reversing upstream triggers that lead to point/task.
     """
     graph_parents: Dict['SequenceBase', List[TaskTuple]] = {}
+
     for seq, triggers in tdef.graph_parents.items():
         if not seq.is_valid(point):
             # Don't infer parents if the trigger belongs to a sequence that
@@ -353,8 +354,8 @@ def has_only_abs_triggers(self, point):
                     if (
                         trig.offset_is_absolute or
                         trig.offset_is_from_icp or
-                        # Don't count self-suicide as a normal trigger.
-                        dep.suicide and trig.task_name == self.name
+                        # Don't count suicide as a normal trigger:
+                        dep.suicide
                     ):
                         has_abs = True
                     else:

tests/integration/test_taskdef.py

@@ -14,13 +14,43 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+
 from cylc.flow.config import WorkflowConfig
 from cylc.flow.pathutil import get_workflow_run_dir
 from cylc.flow.scheduler_cli import RunOptions
 from cylc.flow.task_outputs import TASK_OUTPUT_SUCCEEDED
 from cylc.flow.workflow_files import WorkflowFiles
 
 
+async def test_almost_self_suicide(flow, scheduler, start):
+    """Suicide triggers should not count as upstream tasks when looking
+    to spawn parentless tasks.
+
+    https://github.com/cylc/cylc-flow/issues/6594
+
+    For the example under test, pre-requisites for ``!a`` should not be
+    considered the same as pre-requisites for ``a``. If the are then then
+    is parentless return false for all cases of ``a`` not in the inital cycle
+    and subsequent cycles never run.
+    """
+    wid = flow({
+        'scheduler': {'cycle point format': '%Y'},
+        'scheduling': {
+            'initial cycle point': 1990,
+            'final cycle point': 1992,
+            'graph': {
+                'R1': 'install_cold',
+                'P1Y': 'install_cold[^] => a? => b?\nb:fail? => !a?'
+            }
+        }
+    })
+    schd = scheduler(wid)
+    async with start(schd):
+        tasks = [str(t) for t in schd.pool.get_tasks()]
+        for task in ['1990/a:waiting', '1991/a:waiting', '1992/a:waiting']:
+            assert task in tasks
+
+
 def test_graph_children(flow):
     """TaskDef.graph_children should not include duplicates.