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=12a8055ecdd8691bc8cc29cef4c23a1804d66fda;hb=48ce047aceb6831be7bc8bcb9255a56e110e4dd5;hp=44d4689fc68e2bd34042132d32951ac420f9e706;hpb=e4854a4e8f9738edea289d65c55590e1bf9fe7e7;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 44d4689f..12a8055e 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
@@ -5,7 +5,6 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  RequiredStatistics,
   WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
@@ -23,13 +22,6 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   >
   extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
   implements IWorkerChoiceStrategy {
-  /** @inheritDoc */
-  public readonly requiredStatistics: RequiredStatistics = {
-    runTime: true,
-    avgRunTime: true,
-    medRunTime: false
-  }
-
   /**
    * Worker node id where the current task will be submitted.
    */
@@ -54,7 +46,7 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
     opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
   ) {
     super(pool, opts)
-    this.checkOptions(this.opts)
+    this.setRequiredStatistics(this.opts)
     this.defaultWorkerWeight = this.computeDefaultWorkerWeight()
     this.roundWeights = this.getRoundWeights()
   }
@@ -73,46 +65,38 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
-    let chosenWorkerNodeKey: number
-    const workerWeight =
-      this.opts.weights?.[this.currentWorkerNodeId] ?? this.defaultWorkerWeight
-    if (workerWeight >= this.roundWeights[this.currentRoundId]) {
-      chosenWorkerNodeKey = this.currentWorkerNodeId
-      this.currentWorkerNodeId =
-        this.currentWorkerNodeId === this.pool.workerNodes.length - 1
-          ? 0
-          : this.currentWorkerNodeId + 1
-      if (this.currentWorkerNodeId === this.pool.workerNodes.length - 1) {
-        this.currentRoundId =
-          this.currentRoundId === this.roundWeights.length - 1
-            ? 0
-            : this.currentRoundId + 1
-      }
-    } else {
-      let roundId: number | undefined
-      let workerNodeId: number | undefined
+    let roundId: number | undefined
+    let workerNodeId: number | undefined
+    for (
+      let roundIndex = this.currentRoundId;
+      roundIndex < this.roundWeights.length;
+      roundIndex++
+    ) {
       for (
-        let round = this.currentRoundId;
-        round < this.roundWeights.length;
-        round++
+        let workerNodeKey = this.currentWorkerNodeId;
+        workerNodeKey < this.pool.workerNodes.length;
+        workerNodeKey++
       ) {
-        for (
-          let workerNodeKey = this.currentWorkerNodeId + 1;
-          workerNodeKey < this.pool.workerNodes.length;
-          workerNodeKey++
-        ) {
-          const workerWeight =
-            this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
-          if (workerWeight >= this.roundWeights[round]) {
-            roundId = round
-            workerNodeId = workerNodeKey
-            break
-          }
+        const workerWeight =
+          this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
+        if (workerWeight >= this.roundWeights[roundIndex]) {
+          roundId = roundIndex
+          workerNodeId = workerNodeKey
+          break
         }
       }
-      this.currentRoundId = roundId ?? 0
-      this.currentWorkerNodeId = workerNodeId ?? 0
-      chosenWorkerNodeKey = this.currentWorkerNodeId
+    }
+    this.currentRoundId = roundId ?? 0
+    this.currentWorkerNodeId = workerNodeId ?? 0
+    const chosenWorkerNodeKey = this.currentWorkerNodeId
+    if (this.currentWorkerNodeId === this.pool.workerNodes.length - 1) {
+      this.currentWorkerNodeId = 0
+      this.currentRoundId =
+        this.currentRoundId === this.roundWeights.length - 1
+          ? 0
+          : this.currentRoundId + 1
+    } else {
+      this.currentWorkerNodeId = this.currentWorkerNodeId + 1
     }
     return chosenWorkerNodeKey
   }
@@ -122,11 +106,12 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
     if (this.currentWorkerNodeId === workerNodeKey) {
       if (this.pool.workerNodes.length === 0) {
         this.currentWorkerNodeId = 0
-      } else {
-        this.currentWorkerNodeId =
-          this.currentWorkerNodeId > this.pool.workerNodes.length - 1
-            ? this.pool.workerNodes.length - 1
-            : this.currentWorkerNodeId
+      } else if (this.currentWorkerNodeId > this.pool.workerNodes.length - 1) {
+        this.currentWorkerNodeId = this.pool.workerNodes.length - 1
+        this.currentRoundId =
+          this.currentRoundId === this.roundWeights.length - 1
+            ? 0
+            : this.currentRoundId + 1
       }
     }
     return true