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=15a6c7f48eaac7f0a81e5a30bfd74762a426435d;hb=ca57f271eeee850c946584ba7cb96e8fc5f84f8b;hp=b034cba1d08d69761b3c8f05fdedf395c4702c0a;hpb=b7e141c40bccfd7a4ec0ff98b7829f7d296f048b;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 b034cba1..15a6c7f4 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
@@ -105,6 +105,7 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
         const workerWeight =
           this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
         if (
+          this.isWorkerNodeReady(workerNodeKey) &&
           workerWeight >= this.roundWeights[roundIndex] &&
           this.workerNodeVirtualTaskRunTime < workerWeight
         ) {
@@ -121,18 +122,20 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
   }
 
   private interleavedWeightedRoundRobinNextWorkerNodeId (): void {
-    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
-    }
+    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))
   }
 
   /** @inheritDoc */