From 5a6fef91610c3b6dd0099a584df0b04341137f6e Mon Sep 17 00:00:00 2001 From: Eric Allam Date: Mon, 14 Jul 2025 14:11:34 +0100 Subject: [PATCH] fix: prevent stuck batchTriggerAndWait by finalizing runs when they are cancelled --- .../run-engine/src/engine/systems/runAttemptSystem.ts | 2 ++ packages/core/src/v3/workers/taskExecutor.ts | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts b/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts index 11a42121e18..6dfb71c3989 100644 --- a/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts +++ b/internal-packages/run-engine/src/engine/systems/runAttemptSystem.ts @@ -1102,6 +1102,8 @@ export class RunAttemptSystem { output: { value: JSON.stringify(error), isError: true }, }); + await this.#finalizeRun(run); + this.$.eventBus.emit("runCancelled", { time: new Date(), run: { diff --git a/packages/core/src/v3/workers/taskExecutor.ts b/packages/core/src/v3/workers/taskExecutor.ts index 54b68bbb556..09ae846db23 100644 --- a/packages/core/src/v3/workers/taskExecutor.ts +++ b/packages/core/src/v3/workers/taskExecutor.ts @@ -440,7 +440,6 @@ export class TaskExecutor { const abortPromise = new Promise((_, reject) => { signal.addEventListener("abort", () => { if (typeof signal.reason === "string" && signal.reason.includes("cancel")) { - console.log("abortPromise: cancel"); return; }