X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-used-worker-choice-strategy.ts;h=e8a7218e160879bcaa97399d78a3b39ff7857bc1;hb=3d76750ac8dacd95003ca89cf9542c3b2a014b8c;hp=53aa05eed641d557631e56e964b7d57739a4a7f8;hpb=f59e102739e13698f278f1d9d58ab26ed8150442;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 53aa05ee..e8a7218e 100644 --- a/src/pools/selection-strategies/least-used-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-used-worker-choice-strategy.ts @@ -42,6 +42,15 @@ export class LeastUsedWorkerChoiceStrategy< /** @inheritDoc */ public choose (): number { + return this.leastUsedNextWorkerNodeKey() + } + + /** @inheritDoc */ + public remove (): boolean { + return true + } + + private leastUsedNextWorkerNodeKey (): number { let minNumberOfTasks = Infinity for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { const workerTaskStatistics = workerNode.usage.tasks @@ -49,19 +58,17 @@ export class LeastUsedWorkerChoiceStrategy< workerTaskStatistics.executed + workerTaskStatistics.executing + workerTaskStatistics.queued - if (workerTasks === 0) { - this.nextWorkerNodeId = workerNodeKey + if (this.isWorkerNodeReady(workerNodeKey) && workerTasks === 0) { + this.nextWorkerNodeKey = workerNodeKey break - } else if (workerTasks < minNumberOfTasks) { + } else if ( + this.isWorkerNodeReady(workerNodeKey) && + workerTasks < minNumberOfTasks + ) { minNumberOfTasks = workerTasks - this.nextWorkerNodeId = workerNodeKey + this.nextWorkerNodeKey = workerNodeKey } } - return this.nextWorkerNodeId - } - - /** @inheritDoc */ - public remove (): boolean { - return true + return this.nextWorkerNodeKey } }