mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-02-21 02:56:40 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(core): Clear active execution on cancellation in scaling mode (#9979)

Browse source
This commit is contained in:
Iván Ovejero 2024-07-09 17:09:39 +02:00 committed by GitHub
parent 761229e4d2
commit 7e972c78af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/executions/__tests__/execution.service.test.ts
View file

@ -235,6 +235,7 @@ describe('ExecutionService', () => {
* Assert * Assert
*/ */
expect(waitTracker.stopExecution).not.toHaveBeenCalled(); expect(waitTracker.stopExecution).not.toHaveBeenCalled();
expect(activeExecutions.stopExecution).toHaveBeenCalled();
expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id }); expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
expect(queue.stopJob).toHaveBeenCalled(); expect(queue.stopJob).toHaveBeenCalled();
expect(executionRepository.stopDuringRun).toHaveBeenCalled(); expect(executionRepository.stopDuringRun).toHaveBeenCalled();
@ -260,6 +261,7 @@ describe('ExecutionService', () => {
* Assert * Assert
*/ */
expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id); expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id);
expect(activeExecutions.stopExecution).toHaveBeenCalled();
expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id }); expect(queue.findRunningJobBy).toBeCalledWith({ executionId: execution.id });
expect(queue.stopJob).toHaveBeenCalled(); expect(queue.stopJob).toHaveBeenCalled();
expect(executionRepository.stopDuringRun).toHaveBeenCalled(); expect(executionRepository.stopDuringRun).toHaveBeenCalled();

4
packages/cli/src/executions/execution.service.ts
View file

@ -460,6 +460,10 @@ export class ExecutionService {
return await this.stopInRegularMode(execution); return await this.stopInRegularMode(execution);
} }
if (this.activeExecutions.has(execution.id)) {
await this.activeExecutions.stopExecution(execution.id);
}
if (this.waitTracker.has(execution.id)) { if (this.waitTracker.has(execution.id)) {
await this.waitTracker.stopExecution(execution.id); await this.waitTracker.stopExecution(execution.id);
} }