X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Fleast-used-worker-choice-strategy.ts;h=e72efda2eb7db69411cc324e2e003c64fa08f529;hb=cb9b167557f9a903021bca1c7aba9fc9b24ae1b1;hp=910d10a3ac320db8f3feac42eb43293181a806d1;hpb=9b1068374b1a52479b07e1e22b692289d5579237;p=poolifier.git diff --git a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts index 910d10a3..e72efda2 100644 --- a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts @@ -42,8 +42,7 @@ export class LeastUsedWorkerChoiceStrategy< /** @inheritDoc */ public choose (): number { - this.leastUsedNextWorkerNodeKey() - return this.nextWorkerNodeKey + return this.leastUsedNextWorkerNodeKey() } /** @inheritDoc */ @@ -51,7 +50,7 @@ export class LeastUsedWorkerChoiceStrategy< return true } - private leastUsedNextWorkerNodeKey (): void { + private leastUsedNextWorkerNodeKey (): number { let minNumberOfTasks = Infinity for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { const workerTaskStatistics = workerNode.usage.tasks @@ -59,16 +58,17 @@ export class LeastUsedWorkerChoiceStrategy< workerTaskStatistics.executed + workerTaskStatistics.executing + workerTaskStatistics.queued - if (this.isWorkerNodeReady(workerNodeKey) && workerTasks === 0) { + if (this.isWorkerNodeEligible(workerNodeKey) && workerTasks === 0) { this.nextWorkerNodeKey = workerNodeKey break } else if ( - this.isWorkerNodeReady(workerNodeKey) && + this.isWorkerNodeEligible(workerNodeKey) && workerTasks < minNumberOfTasks ) { minNumberOfTasks = workerTasks this.nextWorkerNodeKey = workerNodeKey } } + return this.nextWorkerNodeKey } }