fix(jdbc): purge executor state at the end

kestra-io · Mar 7, 2023 · a9dc5b6 · a9dc5b6
1 parent 6e6c333
commit a9dc5b6
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/core/src/test/java/io/kestra/core/runners/RestartCaseTest.java b/core/src/test/java/io/kestra/core/runners/RestartCaseTest.java
@@ -106,4 +106,31 @@ public void replay() throws Exception {
         assertThat(finishedRestartedExecution.getParentId(), is(firstExecution.getId()));
         assertThat(finishedRestartedExecution.getState().getCurrent(), is(State.Type.SUCCESS));
     }
+
+    public void restartMultiple() throws Exception {
+        Execution execution = runnerUtils.runOne("io.kestra.tests", "failed-first");
+        assertThat(execution.getTaskRunList(), hasSize(1));
+        assertThat(execution.getState().getCurrent(), is(State.Type.FAILED));
+
+        Execution restart = executionService.restart(execution, null);
+        assertThat(restart.getState().getCurrent(), is(State.Type.RESTARTED));
+
+        Execution restartEnded = runnerUtils.awaitExecution(
+            e -> e.getState().getCurrent() == State.Type.FAILED,
+            () -> executionQueue.emit(restart),
+            Duration.ofSeconds(120)
+        );
+
+        assertThat(restartEnded.getState().getCurrent(), is(State.Type.FAILED));
+
+        Execution newRestart = executionService.restart(restartEnded, null);
+
+        restartEnded = runnerUtils.awaitExecution(
+            e -> e.getState().getCurrent() == State.Type.FAILED,
+            () -> executionQueue.emit(newRestart),
+            Duration.ofSeconds(120)
+        );
+
+        assertThat(restartEnded.getState().getCurrent(), is(State.Type.FAILED));
+    }
 }
diff --git a/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java b/jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java
@@ -414,8 +414,7 @@ private void toExecution(Executor executor) {
 
         // delete if ended
         if (executorService.canBePurged(executor)) {
-            // TODO
-            // executorStateStorage.delete(executor.getExecution());
+            executorStateStorage.delete(executor.getExecution());
         }
     }
 

diff --git a/jdbc/src/test/java/io/kestra/jdbc/runner/JdbcRunnerTest.java b/jdbc/src/test/java/io/kestra/jdbc/runner/JdbcRunnerTest.java
@@ -151,6 +151,11 @@ void replay() throws Exception {
         restartCaseTest.replay();
     }
 
+    @Test
+    void restartMultiple() throws Exception {
+        restartCaseTest.restartMultiple();
+    }
+
     @Test
     void flowTrigger() throws Exception {
         flowTriggerCaseTest.trigger();