X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=0f992cfaf82d17794def8c9a129dacf91075f2ec;hb=f6bc9f26d8a0246bbee14b2b03d0bcc41b8aeb52;hp=7c837ceff3d7b7ca45a5bd9da29feaa70784ef0c;hpb=20016c79549983d09d30b70852ec7fae515d4156;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 7c837cef..0f992cfa 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,10 @@ export class LeastEluWorkerChoiceStrategy< } /** @inheritDoc */ - public choose (): number { - return this.leastEluNextWorkerNodeKey() + public choose (): number | undefined { + const chosenWorkerNodeKey = this.leastEluNextWorkerNodeKey() + this.assignChosenWorkerNodeKey(chosenWorkerNodeKey) + return this.nextWorkerNodeKey } /** @inheritDoc */ @@ -65,22 +67,23 @@ export class LeastEluWorkerChoiceStrategy< return true } - private leastEluNextWorkerNodeKey (): number { + 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 this.nextWorkerNodeKey + return chosenWorkerNodeKey } }