From d3127e8409afde2d33be3bf0a04065da98b535c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sun, 7 May 2023 23:12:36 +0200 Subject: [PATCH] refactor: cleanup variable namespace in IWRR code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- ...aved-weighted-round-robin-worker-choice-strategy.ts | 10 +++++----- .../selection-strategies/selection-strategies-types.ts | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) 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 24f7ac9a..b14bb8bc 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 @@ -76,9 +76,9 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< let roundId: number | undefined let workerNodeId: number | undefined for ( - let round = this.currentRoundId; - round < this.roundWeights.length; - round++ + let roundIndex = this.currentRoundId; + roundIndex < this.roundWeights.length; + roundIndex++ ) { for ( let workerNodeKey = this.currentWorkerNodeId; @@ -87,8 +87,8 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< ) { const workerWeight = this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight - if (workerWeight >= this.roundWeights[round]) { - roundId = round + if (workerWeight >= this.roundWeights[roundIndex]) { + roundId = roundIndex workerNodeId = workerNodeKey break } diff --git a/src/pools/selection-strategies/selection-strategies-types.ts b/src/pools/selection-strategies/selection-strategies-types.ts index f2b401d6..6ae695ca 100644 --- a/src/pools/selection-strategies/selection-strategies-types.ts +++ b/src/pools/selection-strategies/selection-strategies-types.ts @@ -24,6 +24,8 @@ export const WorkerChoiceStrategies = Object.freeze({ WEIGHTED_ROUND_ROBIN: 'WEIGHTED_ROUND_ROBIN', /** * Interleaved weighted round robin worker selection strategy. + * + * @experimental */ INTERLEAVED_WEIGHTED_ROUND_ROBIN: 'INTERLEAVED_WEIGHTED_ROUND_ROBIN' } as const) -- 2.34.1