X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=6fad8939e75aa0f2a3dca8e332c08ba529ba3a83;hb=0717df3dc168fc35b8268713ac8b7bde86f024a9;hp=9a1550e06f60dfecc4339f56ac2c01ad3a7344cf;hpb=20016c79549983d09d30b70852ec7fae515d4156;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 9a1550e0..6fad8939 100644 --- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts @@ -60,8 +60,9 @@ export class LeastBusyWorkerChoiceStrategy< } /** @inheritDoc */ - public choose (): number { - return this.leastBusyNextWorkerNodeKey() + public choose (): number | undefined { + this.nextWorkerNodeKey = this.leastBusyNextWorkerNodeKey() + return this.nextWorkerNodeKey } /** @inheritDoc */ @@ -69,23 +70,24 @@ export class LeastBusyWorkerChoiceStrategy< return true } - private leastBusyNextWorkerNodeKey (): number { + private leastBusyNextWorkerNodeKey (): number | undefined { let minTime = Infinity + let chosenWorkerNodeKey: number | undefined for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { const workerTime = (workerNode.usage.runTime?.aggregate ?? 0) + (workerNode.usage.waitTime?.aggregate ?? 0) - if (this.isWorkerNodeReady(workerNodeKey) && workerTime === 0) { - this.nextWorkerNodeKey = workerNodeKey + if (this.isWorkerNodeEligible(workerNodeKey) && workerTime === 0) { + chosenWorkerNodeKey = workerNodeKey break } else if ( - this.isWorkerNodeReady(workerNodeKey) && + this.isWorkerNodeEligible(workerNodeKey) && workerTime < minTime ) { minTime = workerTime - this.nextWorkerNodeKey = workerNodeKey + chosenWorkerNodeKey = workerNodeKey } } - return this.nextWorkerNodeKey + return chosenWorkerNodeKey } }