jprdonnelly/kestra
1
0
Fork 0
mirror of https://github.com/kestra-io/kestra.git synced 2025-12-19 18:05:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(worker): worker execution result (#2616)

Browse Source 
* fix(core, jdbc, runner-memory): set Executable taskrun to RUNNING earlier

Or RUNNING will be set when the subflow is RUNNING and when it is terminated erasing previous RUNNING start date.

* fix(core): avoid duplicate state change in the Flow task
This commit is contained in:
Loïc Mathieu
2023-11-30 21:09:32 +01:00
committed by GitHub
parent e091cf7ce9
commit fca0030f0f
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/io/kestra/core/runners/ExecutableUtils.java
View File

@@ -99,7 +99,7 @@ public final class ExecutableUtils {
return WorkerTaskExecution.builder() return WorkerTaskExecution.builder()
.task(currentTask) .task(currentTask)
.taskRun(currentTaskRun) .taskRun(currentTaskRun.withState(State.Type.RUNNING))
.execution(execution) .execution(execution)
.iteration(iteration) .iteration(iteration)
.build(); .build();
@@ -117,11 +117,11 @@ public final class ExecutableUtils {
State.Type currentState = taskRun.getState().getCurrent(); State.Type currentState = taskRun.getState().getCurrent();
Optional<State.Type> previousState = taskRun.getState().getHistories().size() > 1 ? Optional.of(taskRun.getState().getHistories().get(taskRun.getState().getHistories().size() - 2).getState()) : Optional.empty(); Optional<State.Type> previousState = taskRun.getState().getHistories().size() > 1 ? Optional.of(taskRun.getState().getHistories().get(taskRun.getState().getHistories().size() - 2).getState()) : Optional.empty();
int currentStateIteration = getIterationCounter(iterations, currentState, maxIterations) + 1; int currentStateIteration = iterations.getOrDefault(currentState.toString(), 0);
iterations.put(currentState.toString(), currentStateIteration); iterations.put(currentState.toString(), currentStateIteration + 1);
if (previousState.isPresent() && previousState.get() != currentState) { if (previousState.isPresent() && previousState.get() != currentState) {
int previousStateIterations = getIterationCounter(iterations, previousState.get(), maxIterations) - 1; int previousStateIterations = iterations.getOrDefault(previousState.get() .toString(), maxIterations);
iterations.put(previousState.get().toString(), previousStateIterations); iterations.put(previousState.get().toString(), previousStateIterations - 1);
} }
// update the state to success if current == max // update the state to success if current == max

5
core/src/main/java/io/kestra/core/tasks/flows/Flow.java
View File

@@ -175,7 +175,10 @@ public class Flow extends Task implements ExecutableTask<Flow.Output> {
taskRun = taskRun.withOutputs(builder.build().toMap()); taskRun = taskRun.withOutputs(builder.build().toMap());
taskRun = taskRun.withState(ExecutableUtils.guessState(execution, this.transmitFailed, this.isAllowFailure())); State.Type finalState = ExecutableUtils.guessState(execution, this.transmitFailed, this.isAllowFailure());
if (taskRun.getState().getCurrent() != finalState) {
taskRun = taskRun.withState(finalState);
}
return Optional.of(ExecutableUtils.workerTaskResult(taskRun)); return Optional.of(ExecutableUtils.workerTaskResult(taskRun));
} }

4
core/src/test/java/io/kestra/core/tasks/flows/ForEachItemCaseTest.java
View File

@@ -110,8 +110,8 @@ public class ForEachItemCaseTest {
assertThat(outputs.get("iterations"), notNullValue()); assertThat(outputs.get("iterations"), notNullValue());
Map<String, Integer> iterations = (Map<String, Integer>) outputs.get("iterations"); Map<String, Integer> iterations = (Map<String, Integer>) outputs.get("iterations");
assertThat(iterations.get("max"), is(3)); assertThat(iterations.get("max"), is(3));
assertThat(iterations.get("CREATED"), is(0)); assertThat(iterations.get("CREATED"), nullValue());// if we didn't wait we will only observe RUNNING and SUCCESS
assertThat(iterations.get("RUNNING"), nullValue()); // if we didn't wait we will only observe CREATED and SUCCESS assertThat(iterations.get("RUNNING"), is(0));
assertThat(iterations.get("SUCCESS"), is(3)); assertThat(iterations.get("SUCCESS"), is(3));
// assert that not all subflows ran (depending on the speed of execution there can be some) // assert that not all subflows ran (depending on the speed of execution there can be some)

4
jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java
View File

@@ -414,7 +414,7 @@ public class JdbcExecutor implements ExecutorInterface {
// send a running worker task result to track running vs created status // send a running worker task result to track running vs created status
if (workerTaskExecution.getTask().waitForExecution()) { if (workerTaskExecution.getTask().waitForExecution()) {
sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(State.Type.RUNNING)); sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun());
} }
}); });
} }
@@ -434,7 +434,7 @@ public class JdbcExecutor implements ExecutorInterface {
.ifPresent(workerTaskExecution -> { .ifPresent(workerTaskExecution -> {
// If we didn't wait for the flow execution, the worker task execution has already been created by the Executor service. // If we didn't wait for the flow execution, the worker task execution has already been created by the Executor service.
if (workerTaskExecution.getTask().waitForExecution()) { if (workerTaskExecution.getTask().waitForExecution()) {
sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(State.Type.RUNNING).withState(execution.getState().getCurrent())); sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(execution.getState().getCurrent()));
} }
workerTaskExecutionStorage.delete(workerTaskExecution); workerTaskExecutionStorage.delete(workerTaskExecution);

4
runner-memory/src/main/java/io/kestra/runner/memory/MemoryExecutor.java
View File

@@ -237,7 +237,7 @@ public class MemoryExecutor implements ExecutorInterface {
// send a running worker task result to track running vs created status // send a running worker task result to track running vs created status
if (workerTaskExecution.getTask().waitForExecution()) { if (workerTaskExecution.getTask().waitForExecution()) {
sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(State.Type.RUNNING)); sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun());
} }
}); });
} }
@@ -259,7 +259,7 @@ public class MemoryExecutor implements ExecutorInterface {
// If we didn't wait for the flow execution, the worker task execution has already been created by the Executor service. // If we didn't wait for the flow execution, the worker task execution has already been created by the Executor service.
if (workerTaskExecution.getTask().waitForExecution()) { if (workerTaskExecution.getTask().waitForExecution()) {
sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(State.Type.RUNNING).withState(execution.getState().getCurrent())); sendWorkerTaskResultForWorkerTaskExecution(execution, workerTaskExecution, workerTaskExecution.getTaskRun().withState(execution.getState().getCurrent()));
} }
WORKERTASKEXECUTIONS_WATCHER.remove(execution.getId()); WORKERTASKEXECUTIONS_WATCHER.remove(execution.getId());