From a38b62f12dcf25476b2d0409edfa98f96a36da20 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 20 Oct 2023 06:18:30 +0200 Subject: [PATCH 1/1] refactor: use builtin retry mechanism in worker choice strategies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- .../abstract-worker-choice-strategy.ts | 9 +++++ ...hted-round-robin-worker-choice-strategy.ts | 26 ++++++------- .../round-robin-worker-choice-strategy.ts | 11 +++--- ...hted-round-robin-worker-choice-strategy.ts | 38 +++++++++---------- 4 files changed, 45 insertions(+), 39 deletions(-) diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index 86692de9..c3649333 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -126,6 +126,15 @@ export abstract class AbstractWorkerChoiceStrategy< return this.pool.workerNodes[workerNodeKey]?.info?.ready ?? false } + /** + * Check the next worker node readiness. + */ + protected checkNextWorkerNodeReadiness (): void { + if (!this.isWorkerNodeReady(this.nextWorkerNodeKey as number)) { + delete this.nextWorkerNodeKey + } + } + /** * Gets the worker node task runtime. * If the task statistics require the average runtime, the average runtime is returned. 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 15a6c7f4..eee39ec8 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 @@ -122,20 +122,18 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy< } private interleavedWeightedRoundRobinNextWorkerNodeId (): void { - do { - if ( - this.roundId === this.roundWeights.length - 1 && - this.workerNodeId === this.pool.workerNodes.length - 1 - ) { - this.roundId = 0 - this.workerNodeId = 0 - } else if (this.workerNodeId === this.pool.workerNodes.length - 1) { - this.roundId = this.roundId + 1 - this.workerNodeId = 0 - } else { - this.workerNodeId = this.workerNodeId + 1 - } - } while (!this.isWorkerNodeReady(this.workerNodeId)) + if ( + this.roundId === this.roundWeights.length - 1 && + this.workerNodeId === this.pool.workerNodes.length - 1 + ) { + this.roundId = 0 + this.workerNodeId = 0 + } else if (this.workerNodeId === this.pool.workerNodes.length - 1) { + this.roundId = this.roundId + 1 + this.workerNodeId = 0 + } else { + this.workerNodeId = this.workerNodeId + 1 + } } /** @inheritDoc */ diff --git a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts index 19dd3872..7c49cec7 100644 --- a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts @@ -46,6 +46,7 @@ export class RoundRobinWorkerChoiceStrategy< const chosenWorkerNodeKey = this.nextWorkerNodeKey this.setPreviousWorkerNodeKey(chosenWorkerNodeKey) this.roundRobinNextWorkerNodeKey() + this.checkNextWorkerNodeReadiness() return chosenWorkerNodeKey } @@ -70,12 +71,10 @@ export class RoundRobinWorkerChoiceStrategy< } private roundRobinNextWorkerNodeKey (): number | undefined { - do { - this.nextWorkerNodeKey = - this.nextWorkerNodeKey === this.pool.workerNodes.length - 1 - ? 0 - : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1 - } while (!this.isWorkerNodeReady(this.nextWorkerNodeKey)) + this.nextWorkerNodeKey = + this.nextWorkerNodeKey === this.pool.workerNodes.length - 1 + ? 0 + : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1 return this.nextWorkerNodeKey } } 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 22bf458f..5148494e 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 @@ -71,7 +71,9 @@ export class WeightedRoundRobinWorkerChoiceStrategy< /** @inheritDoc */ public choose (): number | undefined { this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey) - return this.weightedRoundRobinNextWorkerNodeKey() + this.weightedRoundRobinNextWorkerNodeKey() + this.checkNextWorkerNodeReadiness() + return this.nextWorkerNodeKey } /** @inheritDoc */ @@ -95,25 +97,23 @@ export class WeightedRoundRobinWorkerChoiceStrategy< } private weightedRoundRobinNextWorkerNodeKey (): number | undefined { - do { - const workerWeight = - this.opts.weights?.[ + const workerWeight = + this.opts.weights?.[ + this.nextWorkerNodeKey ?? this.previousWorkerNodeKey + ] ?? this.defaultWorkerWeight + if (this.workerNodeVirtualTaskRunTime < workerWeight) { + this.workerNodeVirtualTaskRunTime = + this.workerNodeVirtualTaskRunTime + + this.getWorkerNodeTaskRunTime( this.nextWorkerNodeKey ?? this.previousWorkerNodeKey - ] ?? this.defaultWorkerWeight - if (this.workerNodeVirtualTaskRunTime < workerWeight) { - this.workerNodeVirtualTaskRunTime = - this.workerNodeVirtualTaskRunTime + - this.getWorkerNodeTaskRunTime( - this.nextWorkerNodeKey ?? this.previousWorkerNodeKey - ) - } else { - this.nextWorkerNodeKey = - this.nextWorkerNodeKey === this.pool.workerNodes.length - 1 - ? 0 - : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1 - this.workerNodeVirtualTaskRunTime = 0 - } - } while (!this.isWorkerNodeReady(this.nextWorkerNodeKey as number)) + ) + } else { + this.nextWorkerNodeKey = + this.nextWorkerNodeKey === this.pool.workerNodes.length - 1 + ? 0 + : (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1 + this.workerNodeVirtualTaskRunTime = 0 + } return this.nextWorkerNodeKey } } -- 2.34.1