fix(core): Clear active execution on cancellation in scaling mode (n8…

…n-io#9979)
netroy · Jul 9, 2024 · 7e972c7 · 7e972c7
1 parent 761229e
commit 7e972c7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts
@@ -235,6 +235,7 @@ describe('ExecutionService', () => {
 					 * Assert
 					 */
 					expect(waitTracker.stopExecution).not.toHaveBeenCalled();
+					expect(activeExecutions.stopExecution).toHaveBeenCalled();
 					expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
 					expect(queue.stopJob).toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();
@@ -260,6 +261,7 @@ describe('ExecutionService', () => {
 					 * Assert
 					 */
 					expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id);
+					expect(activeExecutions.stopExecution).toHaveBeenCalled();
 					expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
 					expect(queue.stopJob).toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();

diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
@@ -460,6 +460,10 @@ export class ExecutionService {
 			return await this.stopInRegularMode(execution);
 		}
 
+		if (this.activeExecutions.has(execution.id)) {
+			await this.activeExecutions.stopExecution(execution.id);
+		}
+
 		if (this.waitTracker.has(execution.id)) {
 			await this.waitTracker.stopExecution(execution.id);
 		}