X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=00919f33f58f5878fd381692bfb2009f2c5b611c;hb=970b38d6f87c7d0d29498f13af934c8ff6d472f5;hp=24c612e073806e1800bbe4113515354dfbdd0334;hpb=9b1068374b1a52479b07e1e22b692289d5579237;p=poolifier.git diff --git a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts index 24c612e0..00919f33 100644 --- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts @@ -56,8 +56,8 @@ export class LeastEluWorkerChoiceStrategy< } /** @inheritDoc */ - public choose (): number { - this.leastEluNextWorkerNodeKey() + public choose (): number | undefined { + this.nextWorkerNodeKey = this.leastEluNextWorkerNodeKey() return this.nextWorkerNodeKey } @@ -66,21 +66,23 @@ export class LeastEluWorkerChoiceStrategy< return true } - private leastEluNextWorkerNodeKey (): void { + private leastEluNextWorkerNodeKey (): number | undefined { let minWorkerElu = Infinity + let chosenWorkerNodeKey: number | undefined for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { const workerUsage = workerNode.usage const workerElu = workerUsage.elu?.active?.aggregate ?? 0 - if (this.isWorkerNodeReady(workerNodeKey) && workerElu === 0) { - this.nextWorkerNodeKey = workerNodeKey + if (this.isWorkerNodeEligible(workerNodeKey) && workerElu === 0) { + chosenWorkerNodeKey = workerNodeKey break } else if ( - this.isWorkerNodeReady(workerNodeKey) && + this.isWorkerNodeEligible(workerNodeKey) && workerElu < minWorkerElu ) { minWorkerElu = workerElu - this.nextWorkerNodeKey = workerNodeKey + chosenWorkerNodeKey = workerNodeKey } } + return chosenWorkerNodeKey } }