Merge pull request #2173 from Netflix/jun-he-patch-2

Improve onWorkflowFinalizedIfEnabled
Netflix · Apr 14, 2021 · 7053043 · 7053043
2 parents 16a5192 + a8afb4c
commit 7053043
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -1146,9 +1146,9 @@ List<String> cancelNonTerminalTasks(Workflow workflow) {
         }
         if (erroredTasks.isEmpty()) {
             try {
-                queueDAO.remove(DECIDER_QUEUE, workflow.getWorkflowId());
                 workflowStatusListener.onWorkflowFinalizedIfEnabled(workflow);
-            } catch (Exception e) {
+                queueDAO.remove(DECIDER_QUEUE, workflow.getWorkflowId());
+	    } catch (Exception e) {
                 LOGGER.error("Error removing workflow: {} from decider queue", workflow.getWorkflowId(), e);
             }
         }