Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(jdbc): delete the executor state at the correct stage #7309

Merged
merged 1 commit into from
Feb 12, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions jdbc/src/main/java/io/kestra/jdbc/runner/JdbcExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -933,6 +933,13 @@ private void toExecution(Executor executor, boolean ignoreFailure) {
}

if (!shouldSend) {
// delete the execution from the state storage if ended
// IMPORTANT: it must be done here as it's when the execution arrives 'again' with a terminated state,
// so we are sure at this point that no new executions will be created otherwise the tate storage would be re-created by the execution queue.
if (executorService.canBePurged(executor)) {
executorStateStorage.delete(executor.getExecution());
}

return;
}

Expand All @@ -957,11 +964,6 @@ private void toExecution(Executor executor, boolean ignoreFailure) {
((JdbcQueue<Execution>) this.executionQueue).emitOnly(null, executor.getExecution());
}

// delete the execution from the state storage if ended
if (executorService.canBePurged(executor)) {
executorStateStorage.delete(executor.getExecution());
}

Execution execution = executor.getExecution();
// handle flow triggers on state change
if (!execution.getState().getCurrent().equals(executor.getOriginalState())) {
Expand Down
Loading