fix(core): restarted & retry execution don't display log in realtime

close #573
kestra-io · Aug 2, 2022 · 5a565bf · 5a565bf
1 parent 3e999cf
commit 5a565bf
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/core/src/main/java/io/kestra/core/models/executions/Execution.java b/core/src/main/java/io/kestra/core/models/executions/Execution.java
@@ -411,6 +411,14 @@ public boolean hasTaskRunJoinable(TaskRun taskRun)  {
             return true;
         }
 
+        // attempts & retry need to be saved
+        if (
+            (current.getAttempts() == null && taskRun.getAttempts() != null) ||
+                (current.getAttempts() != null && taskRun.getAttempts() != null && current.getAttempts().size() < taskRun.getAttempts().size())
+        ) {
+            return true;
+        }
+
         // same status
         if (current.getState().getCurrent() == taskRun.getState().getCurrent()) {
             return false;

diff --git a/core/src/test/java/io/kestra/core/runners/RetryTest.java b/core/src/test/java/io/kestra/core/runners/RetryTest.java
@@ -2,15 +2,25 @@
 
 import io.kestra.core.models.executions.Execution;
 import io.kestra.core.models.flows.State;
+import io.kestra.core.queues.QueueFactoryInterface;
+import io.kestra.core.queues.QueueInterface;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeoutException;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 
 public class RetryTest extends AbstractMemoryRunnerTest {
+    @Inject
+    @Named(QueueFactoryInterface.EXECUTION_NAMED)
+    protected QueueInterface<Execution> executionQueue;
+
     @Test
     void retrySuccess() throws TimeoutException {
         Execution execution = runnerUtils.runOne("io.kestra.tests", "retry-success");
@@ -22,9 +32,16 @@ void retrySuccess() throws TimeoutException {
 
     @Test
     void retryFailed() throws TimeoutException {
+        List<Execution> executions = new ArrayList<>();
+        executionQueue.receive(executions::add);
+
         Execution execution = runnerUtils.runOne("io.kestra.tests", "retry-failed");
 
         assertThat(execution.getTaskRunList(), hasSize(2));
         assertThat(execution.getTaskRunList().get(0).getAttempts(), hasSize(5));
+
+        // be sure attempts are available on queue
+        assertThat(executions.size(), is(19));
+        assertThat(executions.get(8).getTaskRunList().get(0).getAttempts().size(), is(3));
     }
 }