Add previousStatus filed to WorkflowModel (#2816)

* Add previousStatus filed to WorkflowModel * Add check to only update previousStatus if status changed * Update dependency lock files
Netflix · Mar 9, 2022 · c70a037 · c70a037
1 parent 02a3b4b
commit c70a037
Show file tree

Hide file tree

Showing 27 changed files with 3,922 additions and 47,983 deletions.
diff --git a/annotations-processor/dependencies.lock b/annotations-processor/dependencies.lock
diff --git a/annotations/dependencies.lock b/annotations/dependencies.lock
diff --git a/azureblob-storage/dependencies.lock b/azureblob-storage/dependencies.lock
diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock
diff --git a/client-spring/dependencies.lock b/client-spring/dependencies.lock
diff --git a/client/dependencies.lock b/client/dependencies.lock
diff --git a/common/dependencies.lock b/common/dependencies.lock
diff --git a/contribs/dependencies.lock b/contribs/dependencies.lock
diff --git a/core/dependencies.lock b/core/dependencies.lock
diff --git a/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java b/core/src/main/java/com/netflix/conductor/model/WorkflowModel.java
@@ -101,11 +101,25 @@ public boolean isSuccessful() {
     // Capture the failed taskId if the workflow execution failed because of task failure
     private String failedTaskId;
 
+    private Status previousStatus;
+
+    public Status getPreviousStatus() {
+        return previousStatus;
+    }
+
+    public void setPreviousStatus(Status status) {
+        this.previousStatus = status;
+    }
+
     public Status getStatus() {
         return status;
     }
 
     public void setStatus(Status status) {
+        // update previous status if current status changed
+        if (this.status != status) {
+            setPreviousStatus(this.status);
+        }
         this.status = status;
     }
 

diff --git a/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java b/core/src/test/java/com/netflix/conductor/core/execution/TestWorkflowExecutor.java
@@ -620,6 +620,7 @@ public void testRestartWorkflow() {
         when(executionDAOFacade.updateWorkflow(any())).thenReturn("");
 
         workflowExecutor.restart(workflow.getWorkflowId(), false);
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertEquals(0, workflow.getEndTime());
         assertEquals(0, workflow.getLastRetriedTime());
@@ -646,6 +647,7 @@ public void testRestartWorkflow() {
         when(metadataDAO.getLatestWorkflowDef(workflow.getWorkflowName()))
                 .thenReturn(Optional.of(workflowDef));
         workflowExecutor.restart(workflow.getWorkflowId(), true);
+        assertEquals(WorkflowModel.Status.COMPLETED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertEquals(0, workflow.getEndTime());
         assertEquals(0, workflow.getLastRetriedTime());
@@ -831,6 +833,7 @@ public void testRetryWorkflow() {
         workflowExecutor.retry(workflow.getWorkflowId(), false);
 
         // then:
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertEquals(1, updateWorkflowCalledCounter.get());
         assertEquals(1, updateTasksCalledCounter.get());
@@ -1074,6 +1077,7 @@ public void testRetryWorkflowWithJoinTask() {
         workflowExecutor.retry(workflow.getWorkflowId(), false);
 
         assertEquals(6, workflow.getTasks().size());
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
     }
 
@@ -1156,7 +1160,9 @@ public void testRetryFromLastFailedSubWorkflowTaskThenStartWithLastFailedTask()
         // then
         assertEquals(task.getStatus(), TaskModel.Status.COMPLETED);
         assertEquals(task1.getStatus(), TaskModel.Status.IN_PROGRESS);
+        assertEquals(workflow.getPreviousStatus(), WorkflowModel.Status.FAILED);
         assertEquals(workflow.getStatus(), WorkflowModel.Status.RUNNING);
+        assertEquals(subWorkflow.getPreviousStatus(), WorkflowModel.Status.FAILED);
         assertEquals(subWorkflow.getStatus(), WorkflowModel.Status.RUNNING);
     }
 
@@ -1226,6 +1232,7 @@ public void testRetryTimedOutWorkflowWithoutFailedTasks() {
         workflowExecutor.retry(workflow.getWorkflowId(), false);
 
         // then
+        assertEquals(WorkflowModel.Status.TIMED_OUT, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertTrue(workflow.getLastRetriedTime() > 0);
         assertEquals(1, updateWorkflowCalledCounter.get());
@@ -1290,6 +1297,7 @@ public void testRerunWorkflow() {
         // when:
         when(executionDAOFacade.getWorkflowModel(anyString(), anyBoolean())).thenReturn(workflow);
 
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertNull(workflow.getReasonForIncompletion());
         assertEquals(new HashSet<>(), workflow.getFailedReferenceTaskNames());
@@ -1372,7 +1380,9 @@ public void testRerunSubWorkflow() {
 
         // then:
         assertEquals(TaskModel.Status.IN_PROGRESS, task.getStatus());
+        assertEquals(WorkflowModel.Status.COMPLETED, subWorkflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, subWorkflow.getStatus());
+        assertEquals(WorkflowModel.Status.COMPLETED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
     }
 
@@ -1435,6 +1445,7 @@ public void testRerunWorkflowWithTaskId() {
         // when:
         when(executionDAOFacade.getWorkflowModel(anyString(), anyBoolean())).thenReturn(workflow);
 
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertNull(workflow.getReasonForIncompletion());
         assertEquals(new HashSet<>(), workflow.getFailedReferenceTaskNames());
@@ -1492,6 +1503,7 @@ public void testRerunWorkflowWithSyncSystemTaskId() {
 
         // then:
         assertEquals(TaskModel.Status.COMPLETED, task2.getStatus());
+        assertEquals(WorkflowModel.Status.FAILED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
         assertNull(workflow.getReasonForIncompletion());
         assertEquals(new HashSet<>(), workflow.getFailedReferenceTaskNames());
@@ -1576,7 +1588,9 @@ public void testRerunSubWorkflowWithTaskId() {
         // then:
         assertEquals(TaskModel.Status.SCHEDULED, task2.getStatus());
         assertEquals(TaskModel.Status.IN_PROGRESS, task.getStatus());
+        assertEquals(WorkflowModel.Status.COMPLETED, subWorkflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, subWorkflow.getStatus());
+        assertEquals(WorkflowModel.Status.COMPLETED, workflow.getPreviousStatus());
         assertEquals(WorkflowModel.Status.RUNNING, workflow.getStatus());
     }