Fix subworkflow output during repair

core/src/main/java/com/netflix/conductor/core/execution/tasks/SubWorkflow.java

@@ -205,7 +205,7 @@ private void updateTaskStatus(WorkflowModel subworkflow, TaskModel task) {
                 task.setExternalOutputPayloadStoragePath(
                         subworkflow.getExternalOutputPayloadStoragePath());
             } else {
-                task.getOutputData().putAll(subworkflow.getOutput());
+                task.addOutput(subworkflow.getOutput());
             }
             if (!status.isSuccessful()) {
                 task.setReasonForIncompletion(

core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowRepairService.java

@@ -143,7 +143,12 @@ boolean verifyAndRepairTask(TaskModel task) {
                 && task.getStatus() == TaskModel.Status.IN_PROGRESS) {
             WorkflowModel subWorkflow = executionDAO.getWorkflow(task.getSubWorkflowId(), false);
             if (subWorkflow.getStatus().isTerminal()) {
-                repairSubWorkflowTask(task, subWorkflow.getStatus());
+                LOGGER.info(
+                        "Repairing sub workflow task {} for sub workflow {} in workflow {}",
+                        task.getTaskId(),
+                        task.getSubWorkflowId(),
+                        task.getWorkflowInstanceId());
+                repairSubWorkflowTask(task, subWorkflow);
                 return true;
             }
         }
@@ -165,8 +170,8 @@ private boolean verifyAndRepairWorkflow(String workflowId) {
         return false;
     }
 
-    private void repairSubWorkflowTask(TaskModel task, WorkflowModel.Status subWorkflowStatus) {
-        switch (subWorkflowStatus) {
+    private void repairSubWorkflowTask(TaskModel task, WorkflowModel subWorkflow) {
+        switch (subWorkflow.getStatus()) {
             case COMPLETED:
                 task.setStatus(TaskModel.Status.COMPLETED);
                 break;
@@ -180,6 +185,7 @@ private void repairSubWorkflowTask(TaskModel task, WorkflowModel.Status subWorkf
                 task.setStatus(TaskModel.Status.TIMED_OUT);
                 break;
         }
+        task.addOutput(subWorkflow.getOutput());
         executionDAO.updateTask(task);
     }
 }

core/src/test/java/com/netflix/conductor/core/reconciliation/TestWorkflowRepairService.java

@@ -13,6 +13,7 @@
 package com.netflix.conductor.core.reconciliation;
 
 import java.time.Duration;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Before;
@@ -239,10 +240,14 @@ public void assertInProgressSubWorkflowSystemTasksAreCheckedAndRepaired() {
         task.setTaskId(taskId);
         task.setCallbackAfterSeconds(60);
         task.setSubWorkflowId(subWorkflowId);
+        Map<String, Object> outputMap = new HashMap<>();
+        outputMap.put("subWorkflowId", subWorkflowId);
+        task.setOutputData(outputMap);
 
         WorkflowModel subWorkflow = new WorkflowModel();
         subWorkflow.setWorkflowId(subWorkflowId);
         subWorkflow.setStatus(WorkflowModel.Status.TERMINATED);
+        subWorkflow.setOutput(Map.of("k1", "v1", "k2", "v2"));
 
         when(executionDAO.getWorkflow(subWorkflowId, false)).thenReturn(subWorkflow);
 
@@ -256,5 +261,9 @@ public void assertInProgressSubWorkflowSystemTasksAreCheckedAndRepaired() {
         assertEquals(taskId, argumentCaptor.getValue().getTaskId());
         assertEquals(subWorkflowId, argumentCaptor.getValue().getSubWorkflowId());
         assertEquals(TaskModel.Status.CANCELED, argumentCaptor.getValue().getStatus());
+        assertNotNull(argumentCaptor.getValue().getOutputData());
+        assertEquals(subWorkflowId, argumentCaptor.getValue().getOutputData().get("subWorkflowId"));
+        assertEquals("v1", argumentCaptor.getValue().getOutputData().get("k1"));
+        assertEquals("v2", argumentCaptor.getValue().getOutputData().get("k2"));
     }
 }