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=e37543820593a68b6860e7b597c40919c8866e9d;hb=b9da9d7e74c720f83482a09d1b883fc83d04f4ed;hp=deaa48815e97f0b0d9fc8e42ffc845c6fa118982;hpb=6c6afb8463782af0689101b7c67cea80df83018f;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 deaa4881..e3754382 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
@@ -4,7 +4,6 @@ import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
 import type {
   IWorkerChoiceStrategy,
-  StrategyPolicy,
   WorkerChoiceStrategyOptions
 } from './selection-strategies-types'
 
@@ -12,8 +11,8 @@ import type {
  * Selects the next worker with an interleaved weighted round robin scheduling algorithm.
  *
  * @typeParam Worker - Type of worker which manages the strategy.
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
+ * @typeParam Response - Type of execution response. This can only be structured-cloneable data.
  */
 export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
     Worker extends IWorker,
@@ -22,20 +21,11 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   >
   extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
   implements IWorkerChoiceStrategy {
-  /** @inheritDoc */
-  public readonly strategyPolicy: StrategyPolicy = {
-    useDynamicWorker: true
-  }
-
   /**
-   * Worker node id where the current task will be submitted.
-   */
-  private currentWorkerNodeId: number = 0
-  /**
-   * Current round id.
+   * Round id.
    * This is used to determine the current round weight.
    */
-  private currentRoundId: number = 0
+  private roundId: number = 0
   /**
    * Round weights.
    */
@@ -58,8 +48,8 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public reset (): boolean {
-    this.currentWorkerNodeId = 0
-    this.currentRoundId = 0
+    this.resetWorkerNodeKeyProperties()
+    this.roundId = 0
     return true
   }
 
@@ -69,54 +59,59 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
-    let roundId: number | undefined
+  public choose (): number | undefined {
+    let roundId!: number
     let workerNodeId: number | undefined
     for (
-      let roundIndex = this.currentRoundId;
+      let roundIndex = this.roundId;
       roundIndex < this.roundWeights.length;
       roundIndex++
     ) {
+      roundId = roundIndex
       for (
-        let workerNodeKey = this.currentWorkerNodeId;
+        let workerNodeKey =
+          this.nextWorkerNodeKey ?? this.previousWorkerNodeKey;
         workerNodeKey < this.pool.workerNodes.length;
         workerNodeKey++
       ) {
+        if (!this.isWorkerNodeEligible(workerNodeKey)) {
+          continue
+        }
         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
-    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
+    this.roundId = roundId
+    if (workerNodeId == null) {
+      this.previousWorkerNodeKey =
+        this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+    }
+    this.nextWorkerNodeKey = workerNodeId
+    const chosenWorkerNodeKey = this.nextWorkerNodeKey
+    if (this.nextWorkerNodeKey === this.pool.workerNodes.length - 1) {
+      this.nextWorkerNodeKey = 0
+      this.roundId =
+        this.roundId === this.roundWeights.length - 1 ? 0 : this.roundId + 1
     } else {
-      this.currentWorkerNodeId = this.currentWorkerNodeId + 1
+      this.nextWorkerNodeKey =
+        (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
     }
     return chosenWorkerNodeKey
   }
 
   /** @inheritDoc */
   public remove (workerNodeKey: number): boolean {
-    if (this.currentWorkerNodeId === workerNodeKey) {
+    if (this.nextWorkerNodeKey === workerNodeKey) {
       if (this.pool.workerNodes.length === 0) {
-        this.currentWorkerNodeId = 0
-      } 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
+        this.nextWorkerNodeKey = 0
+      } else if (this.nextWorkerNodeKey > this.pool.workerNodes.length - 1) {
+        this.nextWorkerNodeKey = this.pool.workerNodes.length - 1
+        this.roundId =
+          this.roundId === this.roundWeights.length - 1 ? 0 : this.roundId + 1
       }
     }
     return true