X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=46575b80d851ec719b783a370d20194b8ba72d58;hb=39a43af7ad68492916bd118e29fde53cec533cfa;hp=701e51656366369abadb22edcadca5c3e03c90fe;hpb=7c7bb28936c5de8829dba0794760498077d3ea90;p=poolifier.git diff --git a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts index 701e5165..46575b80 100644 --- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts @@ -7,7 +7,6 @@ import { import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' import type { IWorkerChoiceStrategy, - StrategyPolicy, TaskStatisticsRequirements, WorkerChoiceStrategyOptions } from './selection-strategies-types' @@ -27,12 +26,6 @@ export class WeightedRoundRobinWorkerChoiceStrategy< > extends AbstractWorkerChoiceStrategy implements IWorkerChoiceStrategy { - /** @inheritDoc */ - public readonly strategyPolicy: StrategyPolicy = { - dynamicWorkerUsage: false, - dynamicWorkerReady: true - } - /** @inheritDoc */ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = { runTime: { @@ -65,7 +58,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< /** @inheritDoc */ public reset (): boolean { - this.nextWorkerNodeKey = 0 + this.resetWorkerNodeKeyProperties() this.workerVirtualTaskRunTime = 0 return true } @@ -79,11 +72,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< public choose (): number | undefined { const chosenWorkerNodeKey = this.nextWorkerNodeKey this.weightedRoundRobinNextWorkerNodeKey() - if (!this.isWorkerNodeEligible(this.nextWorkerNodeKey as number)) { - this.nextWorkerNodeKey = undefined - this.previousWorkerNodeKey = - chosenWorkerNodeKey ?? this.previousWorkerNodeKey - } + this.checkNextWorkerNodeEligibility(chosenWorkerNodeKey) return chosenWorkerNodeKey }