Merge pull request #304 from wy-hua/terminate

Refactor workflow termination listener call
conductor-oss · Nov 8, 2024 · 3843f3e · 3843f3e
2 parents 4c4b234 + 535b513
commit 3843f3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutorOps.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutorOps.java
@@ -630,7 +630,6 @@ public WorkflowModel terminateWorkflow(
             String workflowId = workflow.getWorkflowId();
             workflow.setReasonForIncompletion(reason);
             executionDAOFacade.updateWorkflow(workflow);
-            workflowStatusListener.onWorkflowTerminatedIfEnabled(workflow);
             Monitors.recordWorkflowTermination(
                     workflow.getWorkflowName(), workflow.getStatus(), workflow.getOwnerApp());
             LOGGER.info("Workflow {} is terminated because of {}", workflowId, reason);
@@ -697,6 +696,7 @@ public WorkflowModel terminateWorkflow(
                     workflow.getWorkflowName(), workflow.getWorkflowId());
 
             List<String> erroredTasks = cancelNonTerminalTasks(workflow);
+            workflowStatusListener.onWorkflowTerminatedIfEnabled(workflow);
             if (!erroredTasks.isEmpty()) {
                 throw new NonTransientException(
                         String.format(