X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Finterleaved-weighted-round-robin-worker-choice-strategy.ts;h=b034cba1d08d69761b3c8f05fdedf395c4702c0a;hb=946b809b91118cd7442b90971344e53e15c26466;hp=7fba0f1b5dad0972af4ae9630b3c8565301a7863;hpb=226b02a3e2b3619cbe967634ccd6ac7b5d450147;p=poolifier.git diff --git a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts index 7fba0f1b..b034cba1 100644 --- a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts @@ -53,9 +53,9 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< */ private workerNodeId: number = 0 /** - * Worker virtual task runtime. + * Worker node virtual task runtime. */ - private workerVirtualTaskRunTime: number = 0 + private workerNodeVirtualTaskRunTime: number = 0 /** @inheritDoc */ public constructor ( @@ -73,7 +73,7 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< this.resetWorkerNodeKeyProperties() this.roundId = 0 this.workerNodeId = 0 - this.workerVirtualTaskRunTime = 0 + this.workerNodeVirtualTaskRunTime = 0 return true } @@ -98,19 +98,19 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< this.workerNodeId = workerNodeKey if ( this.workerNodeId !== this.nextWorkerNodeKey && - this.workerVirtualTaskRunTime !== 0 + this.workerNodeVirtualTaskRunTime !== 0 ) { - this.workerVirtualTaskRunTime = 0 + this.workerNodeVirtualTaskRunTime = 0 } const workerWeight = this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight if ( workerWeight >= this.roundWeights[roundIndex] && - this.workerVirtualTaskRunTime < workerWeight + this.workerNodeVirtualTaskRunTime < workerWeight ) { - this.workerVirtualTaskRunTime = - this.workerVirtualTaskRunTime + - this.getWorkerTaskRunTime(workerNodeKey) + this.workerNodeVirtualTaskRunTime = + this.workerNodeVirtualTaskRunTime + + this.getWorkerNodeTaskRunTime(workerNodeKey) this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey) this.nextWorkerNodeKey = workerNodeKey return this.nextWorkerNodeKey