X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=2624e5b2fdc68444d1e085452fe117655b45f282;hb=7790a494fdff6a2152b3153d02c9fbe8de11ed93;hp=57e805e18b5b5fb9f25e3b9170fb3baf9e84fa49;hpb=19dbc45b0e2975f938aaae8274902ebe82c48cad;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 57e805e1..2624e5b2 100644 --- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts @@ -56,27 +56,31 @@ export class LeastEluWorkerChoiceStrategy< } /** @inheritDoc */ - public choose (): number { + public choose (): number | undefined { + this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey) + this.nextWorkerNodeKey = this.leastEluNextWorkerNodeKey() + return this.nextWorkerNodeKey + } + + /** @inheritDoc */ + public remove (): boolean { + return true + } + + private leastEluNextWorkerNodeKey (): number | undefined { + let chosenWorkerNodeKey: number | undefined let minWorkerElu = Infinity for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { const workerUsage = workerNode.usage const workerElu = workerUsage.elu?.active?.aggregate ?? 0 - if (this.workerNodeReady(workerNodeKey) && workerElu === 0) { - this.nextWorkerNodeId = workerNodeKey + if (workerElu === 0) { + chosenWorkerNodeKey = workerNodeKey break - } else if ( - this.workerNodeReady(workerNodeKey) && - workerElu < minWorkerElu - ) { + } else if (workerElu < minWorkerElu) { minWorkerElu = workerElu - this.nextWorkerNodeId = workerNodeKey + chosenWorkerNodeKey = workerNodeKey } } - return this.nextWorkerNodeId - } - - /** @inheritDoc */ - public remove (): boolean { - return true + return chosenWorkerNodeKey } }