X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=9a1550e06f60dfecc4339f56ac2c01ad3a7344cf;hb=8f4c94912281e5a11eb6905538a56ed6ab7f51be;hp=7e9d581421319919e865c809df85d06f3c6e305c;hpb=3c93feb918b47943d801029fad82a61469e40127;p=poolifier.git

diff --git a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
index 7e9d5814..9a1550e0 100644
--- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@ -61,24 +61,31 @@ export class LeastBusyWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
+    return this.leastBusyNextWorkerNodeKey()
+  }
+
+  /** @inheritDoc */
+  public remove (): boolean {
+    return true
+  }
+
+  private leastBusyNextWorkerNodeKey (): number {
     let minTime = Infinity
     for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
       const workerTime =
-        workerNode.workerUsage.runTime.aggregate +
-        workerNode.workerUsage.waitTime.aggregate
-      if (workerTime === 0) {
-        this.nextWorkerNodeId = workerNodeKey
+        (workerNode.usage.runTime?.aggregate ?? 0) +
+        (workerNode.usage.waitTime?.aggregate ?? 0)
+      if (this.isWorkerNodeReady(workerNodeKey) && workerTime === 0) {
+        this.nextWorkerNodeKey = workerNodeKey
         break
-      } else if (workerTime < minTime) {
+      } else if (
+        this.isWorkerNodeReady(workerNodeKey) &&
+        workerTime < minTime
+      ) {
         minTime = workerTime
-        this.nextWorkerNodeId = workerNodeKey
+        this.nextWorkerNodeKey = workerNodeKey
       }
     }
-    return this.nextWorkerNodeId
-  }
-
-  /** @inheritDoc */
-  public remove (): boolean {
-    return true
+    return this.nextWorkerNodeKey
   }
 }