Merge "Fix with-items task termination when sub-workflows fail"

mistral/engine/workflow_handler.py

@@ -106,8 +106,8 @@ def set_execution_state(wf_ex, state, state_info=None, set_upstream=False):
         raise exc.WorkflowException(msg)
 
     # Workflow result should be accepted by parent workflows (if any)
-    # only if it completed successfully.
-    wf_ex.accepted = wf_ex.state == states.SUCCESS
+    # only if it completed successfully or failed.
+    wf_ex.accepted = wf_ex.state in (states.SUCCESS, states.ERROR)
 
     # If specified, then recursively set the state of the parent workflow
     # executions to the same state. Only changing state to RUNNING is

mistral/tests/unit/engine/test_with_items.py

@@ -242,6 +242,46 @@ class WithItemsEngineTest(base.EngineTestCase):
         tasks = wf_ex.task_executions
         self.assertEqual(2, len(tasks))
 
+    def test_with_items_sub_workflow_fail(self):
+        workbook = """---
+        version: "2.0"
+
+        name: wb1
+
+        workflows:
+          with_items:
+            type: direct
+
+            tasks:
+              task1:
+                with-items: i in [1, 2, 3]
+                workflow: subworkflow
+                on-error: task2
+
+              task2:
+                action: std.echo output="With-items failed"
+
+          subworkflow:
+            type: direct
+            tasks:
+              fail:
+                action: std.fail
+        """
+        wb_service.create_workbook_v2(workbook)
+
+        # Start workflow.
+        wf_ex = self.engine.start_workflow('wb1.with_items', {})
+
+        self._await(
+            lambda: self.is_execution_success(wf_ex.id),
+        )
+
+        # Note: We need to reread execution to access related tasks.
+        wf_ex = db_api.get_workflow_execution(wf_ex.id)
+
+        tasks = wf_ex.task_executions
+        self.assertEqual(2, len(tasks))
+
     def test_with_items_static_var(self):
         wb_service.create_workbook_v2(WORKBOOK_WITH_STATIC_VAR)