admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-24 04:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Fix execution cancellation issues in scaling mode (#12343)

Browse Source
This commit is contained in:
Iván Ovejero
2024-12-30 13:17:55 +01:00
committed by GitHub
parent 870f8640c7
commit e26b406665
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/cli/src/executions/__tests__/execution.service.test.ts
View File

@@ -242,8 +242,8 @@ describe('ExecutionService', () => {
*/
expect(waitTracker.stopExecution).not.toHaveBeenCalled();
expect(activeExecutions.stopExecution).toHaveBeenCalled();
expect(scalingService.findJobsByStatus).toHaveBeenCalled();
expect(scalingService.stopJob).toHaveBeenCalled();
expect(scalingService.findJobsByStatus).not.toHaveBeenCalled();
expect(scalingService.stopJob).not.toHaveBeenCalled();
expect(executionRepository.stopDuringRun).toHaveBeenCalled();
});
@@ -268,8 +268,8 @@ describe('ExecutionService', () => {
* Assert
*/
expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id);
expect(scalingService.findJobsByStatus).toHaveBeenCalled();
expect(scalingService.stopJob).toHaveBeenCalled();
expect(scalingService.findJobsByStatus).not.toHaveBeenCalled();
expect(scalingService.stopJob).not.toHaveBeenCalled();
expect(executionRepository.stopDuringRun).toHaveBeenCalled();
});
});

14
packages/cli/src/executions/execution.service.ts
View File

@@ -16,7 +16,7 @@ import {
Workflow,
WorkflowOperationError,
} from 'n8n-workflow';
import { Container, Service } from 'typedi';
import { Service } from 'typedi';
import { ActiveExecutions } from '@/active-executions';
import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
@@ -477,18 +477,6 @@ export class ExecutionService {
this.waitTracker.stopExecution(execution.id);
}
const { ScalingService } = await import('@/scaling/scaling.service');
const scalingService = Container.get(ScalingService);
const jobs = await scalingService.findJobsByStatus(['active', 'waiting']);
const job = jobs.find(({ data }) => data.executionId === execution.id);
if (job) {
await scalingService.stopJob(job);
} else {
this.logger.debug('Job to stop not in queue', { executionId: execution.id });
}
return await this.executionRepository.stopDuringRun(execution);
}

2
packages/cli/src/workflow-runner.ts
View File

@@ -66,7 +66,7 @@ export class WorkflowRunner {
//
// FIXME: This is a quick fix. The proper fix would be to not remove
// the execution from the active executions while it's still running.
if (error instanceof ExecutionNotFoundError) {
if (error instanceof ExecutionNotFoundError || error instanceof ExecutionCancelledError) {
return;
}