X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=91fbfc782579f83950482ba71019c9197e5e6348;hb=946b809b91118cd7442b90971344e53e15c26466;hp=14aee44f97a090f5270fa23d41389e32f0c5ee8d;hpb=f59e102739e13698f278f1d9d58ab26ed8150442;p=poolifier.git diff --git a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts index 14aee44f..91fbfc78 100644 --- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts @@ -60,24 +60,28 @@ export class LeastBusyWorkerChoiceStrategy< } /** @inheritDoc */ - public choose (): number { - let minTime = Infinity - for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { - const workerTime = - workerNode.usage.runTime.aggregate + workerNode.usage.waitTime.aggregate - if (workerTime === 0) { - this.nextWorkerNodeId = workerNodeKey - break - } else if (workerTime < minTime) { - minTime = workerTime - this.nextWorkerNodeId = workerNodeKey - } - } - return this.nextWorkerNodeId + public choose (): number | undefined { + this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey) + this.nextWorkerNodeKey = this.leastBusyNextWorkerNodeKey() + return this.nextWorkerNodeKey } /** @inheritDoc */ public remove (): boolean { return true } + + private leastBusyNextWorkerNodeKey (): number | undefined { + return this.pool.workerNodes.reduce( + (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => { + return (workerNode.usage.runTime?.aggregate ?? 0) + + (workerNode.usage.waitTime?.aggregate ?? 0) < + (workerNodes[minWorkerNodeKey].usage.runTime?.aggregate ?? 0) + + (workerNodes[minWorkerNodeKey].usage.waitTime?.aggregate ?? 0) + ? workerNodeKey + : minWorkerNodeKey + }, + 0 + ) + } }