From cf9c7b65548f4d3a4e95e87731ae1c40766d48fb Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Mon, 3 Apr 2023 23:38:29 +0200 Subject: [PATCH] fix: ensure tasks are distributed equally at less used and less busy strategy startup MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../selection-strategies/less-busy-worker-choice-strategy.ts | 2 +- .../selection-strategies/less-used-worker-choice-strategy.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts index f2e40162..e9ba619a 100644 --- a/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/less-busy-worker-choice-strategy.ts @@ -30,7 +30,7 @@ export class LessBusyWorkerChoiceStrategy< let lessBusyWorkerKey!: number for (const [index, workerItem] of this.pool.workers.entries()) { const workerRunTime = workerItem.tasksUsage.runTime - if (!this.isDynamicPool && workerRunTime === 0) { + if (workerRunTime === 0) { return index } else if (workerRunTime < minRunTime) { minRunTime = workerRunTime diff --git a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts index 9cae4a54..f653160b 100644 --- a/src/pools/selection-strategies/less-used-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/less-used-worker-choice-strategy.ts @@ -25,7 +25,7 @@ export class LessUsedWorkerChoiceStrategy< for (const [index, workerItem] of this.pool.workers.entries()) { const tasksUsage = workerItem.tasksUsage const workerTasks = tasksUsage?.run + tasksUsage?.running - if (!this.isDynamicPool && workerTasks === 0) { + if (workerTasks === 0) { return index } else if (workerTasks < minNumberOfTasks) { minNumberOfTasks = workerTasks -- 2.34.1