X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=5338b320b0586bab67195ed5b93e23a0e74cd2f0;hb=5b5321fd0b3ef10dd12b9aa21bf3ca9fa3970e76;hp=5148494ed93f478862504515175708ecdd633f04;hpb=fc76a8447195b5be7ce331a19a5483d4428b8da6;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 5148494e..5338b320 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 @@ -1,14 +1,11 @@ import type { IWorker } from '../worker' import type { IPool } from '../pool' -import { - DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, - DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS -} from '../../utils' +import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' import type { IWorkerChoiceStrategy, - TaskStatisticsRequirements, - WorkerChoiceStrategyOptions + InternalWorkerChoiceStrategyOptions, + TaskStatisticsRequirements } from './selection-strategies-types' /** @@ -37,10 +34,6 @@ export class WeightedRoundRobinWorkerChoiceStrategy< elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } - /** - * Default worker weight. - */ - private readonly defaultWorkerWeight: number /** * Worker node virtual task runtime. */ @@ -49,11 +42,10 @@ export class WeightedRoundRobinWorkerChoiceStrategy< /** @inheritDoc */ public constructor ( pool: IPool, - opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + opts: InternalWorkerChoiceStrategyOptions ) { super(pool, opts) this.setTaskStatisticsRequirements(this.opts) - this.defaultWorkerWeight = this.computeDefaultWorkerWeight() } /** @inheritDoc */ @@ -97,10 +89,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy< } private weightedRoundRobinNextWorkerNodeKey (): number | undefined { - const workerWeight = - this.opts.weights?.[ - this.nextWorkerNodeKey ?? this.previousWorkerNodeKey - ] ?? this.defaultWorkerWeight + const workerWeight = this.opts.weights?.[ + this.nextWorkerNodeKey ?? this.previousWorkerNodeKey + ] as number if (this.workerNodeVirtualTaskRunTime < workerWeight) { this.workerNodeVirtualTaskRunTime = this.workerNodeVirtualTaskRunTime +