opensource/n8n
3
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2026-09-21 12:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(core): Count 'chat' mode executions towards production execution concurrency limits (no-changelog) (#22624)

Browse Source
This commit is contained in:
Jaakko Husso
2025-12-03 16:40:53 +02:00
committed by GitHub
parent 5ebe3729fc
commit 762cabbd15
2 changed files with 55 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+52 -45
View File
@@ -215,31 +215,34 @@ describe('ConcurrencyControlService', () => {
},
);
it.each(['webhook', 'trigger'])('should enqueue on %s mode', async (mode: ExecutionMode) => {
/**
* Arrange
*/
globalConfig.executions.concurrency.productionLimit = 1;
it.each(['webhook', 'trigger', 'chat'])(
'should enqueue on %s mode',
async (mode: ExecutionMode) => {
/**
* Arrange
*/
globalConfig.executions.concurrency.productionLimit = 1;
const service = new ConcurrencyControlService(
logger,
executionRepository,
telemetry,
eventService,
globalConfig,
);
const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
const service = new ConcurrencyControlService(
logger,
executionRepository,
telemetry,
eventService,
globalConfig,
);
const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
/**
* Act
*/
await service.throttle({ mode, executionId: '1' });
/**
* Act
*/
await service.throttle({ mode, executionId: '1' });
/**
* Assert
*/
expect(enqueueSpy).toHaveBeenCalled();
});
/**
* Assert
*/
expect(enqueueSpy).toHaveBeenCalled();
},
);
it('should enqueue on evaluation mode', async () => {
/**
@@ -298,31 +301,34 @@ describe('ConcurrencyControlService', () => {
},
);
it.each(['webhook', 'trigger'])('should dequeue on %s mode', (mode: ExecutionMode) => {
/**
* Arrange
*/
globalConfig.executions.concurrency.productionLimit = 1;
it.each(['webhook', 'trigger', 'chat'])(
'should dequeue on %s mode',
(mode: ExecutionMode) => {
/**
* Arrange
*/
globalConfig.executions.concurrency.productionLimit = 1;
const service = new ConcurrencyControlService(
logger,
executionRepository,
telemetry,
eventService,
globalConfig,
);
const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
const service = new ConcurrencyControlService(
logger,
executionRepository,
telemetry,
eventService,
globalConfig,
);
const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
/**
* Act
*/
service.release({ mode });
/**
* Act
*/
service.release({ mode });
/**
* Assert
*/
expect(dequeueSpy).toHaveBeenCalled();
});
/**
* Assert
*/
expect(dequeueSpy).toHaveBeenCalled();
},
);
it('should dequeue on evaluation mode', () => {
/**
@@ -381,7 +387,7 @@ describe('ConcurrencyControlService', () => {
},
);
it.each(['webhook', 'trigger'])(
it.each(['webhook', 'trigger', 'chat'])(
'should remove an execution on %s mode',
(mode: ExecutionMode) => {
/**
@@ -559,6 +565,7 @@ describe('ConcurrencyControlService', () => {
*/
await service.throttle({ mode: 'trigger', executionId: '1' });
await service.throttle({ mode: 'webhook', executionId: '2' });
await service.throttle({ mode: 'chat', executionId: '3' });
/**
* Assert
packages/cli/src/concurrency/concurrency-control.service.ts
+3 -1
View File
@@ -206,7 +206,9 @@ export class ConcurrencyControlService {
return undefined;
}
if (mode === 'webhook' || mode === 'trigger') return this.queues.get('production');
if (mode === 'webhook' || mode === 'trigger' || mode === 'chat') {
return this.queues.get('production');
}
if (mode === 'evaluation') return this.queues.get('evaluation');