Rebased and applied changes from @v1r3n

conductor-oss · Jul 23, 2024 · 42a708f · 42a708f
1 parent 4976cc6
commit 42a708f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 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
@@ -105,12 +105,6 @@ void restart(String workflowId, boolean useLatestDefinitions)
      */
     WorkflowModel decide(String workflowId);
 
-    /**
-     * @param workflow workflow to be evaluated
-     * @return updated workflow
-     */
-    WorkflowModel decideWithLock(WorkflowModel workflow);
-
     /**
      * @param workflowId id of the workflow to be terminated
      * @param reason termination reason to be recorded

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
@@ -1039,33 +1039,6 @@ public WorkflowModel decide(String workflowId) {
         }
     }
 
-    /**
-     * This method overloads the {@link #decide(String)}. It will acquire a lock and evaluate the
-     * state of the workflow.
-     *
-     * @param workflow the workflow to evaluate the state for
-     * @return the workflow
-     */
-    @Override
-    public WorkflowModel decideWithLock(WorkflowModel workflow) {
-        if (workflow == null) {
-            return null;
-        }
-        StopWatch watch = new StopWatch();
-        watch.start();
-        if (!executionLockService.acquireLock(workflow.getWorkflowId())) {
-            return null;
-        }
-        try {
-            return decide(workflow);
-
-        } finally {
-            executionLockService.releaseLock(workflow.getWorkflowId());
-            watch.stop();
-            Monitors.recordWorkflowDecisionTime(watch.getTime());
-        }
-    }
-
     /**
      * @param workflow the workflow to evaluate the state for
      * @return true if the workflow has completed (success or failed), false otherwise. Note: This

diff --git a/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java b/core/src/main/java/com/netflix/conductor/core/reconciliation/WorkflowSweeper.java
@@ -77,22 +77,21 @@ public CompletableFuture<Void> sweepAsync(String workflowId) {
     }
 
     public void sweep(String workflowId) {
+        WorkflowContext workflowContext = new WorkflowContext(properties.getAppId());
+        WorkflowContext.set(workflowContext);
         WorkflowModel workflow = null;
         try {
             if (!executionLockService.acquireLock(workflowId)) {
                 return;
             }
             workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
-            WorkflowContext workflowContext = new WorkflowContext(properties.getAppId());
-            WorkflowContext.set(workflowContext);
             LOGGER.debug("Running sweeper for workflow {}", workflowId);
-
             if (workflowRepairService != null) {
                 // Verify and repair tasks in the workflow.
                 workflowRepairService.verifyAndRepairWorkflowTasks(workflow);
             }
             long decideStartTime = System.currentTimeMillis();
-            workflow = workflowExecutor.decide(workflow);
+            workflow = workflowExecutor.decide(workflow.getWorkflowId());
             Monitors.recordWorkflowDecisionTime(System.currentTimeMillis() - decideStartTime);
             if (workflow != null && workflow.getStatus().isTerminal()) {
                 queueDAO.remove(DECIDER_QUEUE, workflowId);