n8n 2.25.2 → 2.25.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -41,6 +41,7 @@ let ActiveExecutions = class ActiveExecutions {
|
|
|
41
41
|
let executionStatus = maybeExecutionId ? 'running' : 'new';
|
|
42
42
|
const mode = executionData.executionMode;
|
|
43
43
|
const capacityReservation = new concurrency_capacity_reservation_1.ConcurrencyCapacityReservation(this.concurrencyControl);
|
|
44
|
+
const shouldReserveCapacity = mode !== 'evaluation';
|
|
44
45
|
try {
|
|
45
46
|
if (maybeExecutionId === undefined) {
|
|
46
47
|
const fullExecutionData = {
|
|
@@ -60,14 +61,18 @@ let ActiveExecutions = class ActiveExecutions {
|
|
|
60
61
|
}
|
|
61
62
|
maybeExecutionId = await this.executionPersistence.create(fullExecutionData);
|
|
62
63
|
(0, node_assert_1.strict)(maybeExecutionId);
|
|
63
|
-
|
|
64
|
+
if (shouldReserveCapacity) {
|
|
65
|
+
await capacityReservation.reserve({ mode, executionId: maybeExecutionId });
|
|
66
|
+
}
|
|
64
67
|
if (this.executionsConfig.mode === 'regular') {
|
|
65
68
|
await this.executionRepository.setRunning(maybeExecutionId);
|
|
66
69
|
}
|
|
67
70
|
executionStatus = 'running';
|
|
68
71
|
}
|
|
69
72
|
else {
|
|
70
|
-
|
|
73
|
+
if (shouldReserveCapacity) {
|
|
74
|
+
await capacityReservation.reserve({ mode, executionId: maybeExecutionId });
|
|
75
|
+
}
|
|
71
76
|
const execution = {
|
|
72
77
|
id: maybeExecutionId,
|
|
73
78
|
data: executionData.executionData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA+C;AAE/C,gCAA8C;AAC9C,gCAAkC;AAUlC,+CAKsB;AACtB,6CAA+C;AAG/C,kFAA4E;AAC5E,gGAA0F;AAC1F,8EAA0E;AAE1E,mCAA4C;AAE5C,2FAAsF;AACtF,0DAAsD;AACtD,qGAAgG;AAGzF,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAW5B,YACkB,MAAc,EACd,mBAAwC,EACxC,oBAA0C,EAC1C,kBAA6C,EAC7C,YAA0B,EAC1B,gBAAkC;QALlC,WAAM,GAAN,MAAM,CAAQ;QACd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,uBAAkB,GAAlB,kBAAkB,CAA2B;QAC7C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAb5C,qBAAgB,GAEpB,EAAE,CAAC;QAGC,kBAAa,GAAG,IAAI,GAAG,EAA+B,CAAC;IAS5D,CAAC;IAEJ,GAAG,CAAC,WAAmB;QACtB,OAAO,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,SAAS,CAAC;IACzD,CAAC;IAKD,KAAK,CAAC,GAAG,CACR,aAA4C,EAC5C,gBAAyB;QAEzB,IAAI,eAAe,GAAoB,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5E,MAAM,IAAI,GAAG,aAAa,CAAC,aAAa,CAAC;QACzC,MAAM,mBAAmB,GAAG,IAAI,iEAA8B,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"active-executions.js","sourceRoot":"","sources":["../src/active-executions.ts"],"names":[],"mappings":"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"}
|