X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=984340b552f458c1f2d9704f2767dc39e329d649;hb=refs%2Ftags%2Fv2.7.4;hp=b61bca1c8bdf450083474d8e2d8e78fef48ea2bc;hpb=19dbc45b0e2975f938aaae8274902ebe82c48cad;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 b61bca1c..984340b5 100644
--- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@ -60,25 +60,28 @@ export class LeastBusyWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
-    let minTime = Infinity
-    for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
-      const workerTime =
-        (workerNode.usage.runTime?.aggregate ?? 0) +
-        (workerNode.usage.waitTime?.aggregate ?? 0)
-      if (this.workerNodeReady(workerNodeKey) && workerTime === 0) {
-        this.nextWorkerNodeId = workerNodeKey
-        break
-      } else if (this.workerNodeReady(workerNodeKey) && workerTime < minTime) {
-        minTime = workerTime
-        this.nextWorkerNodeId = workerNodeKey
-      }
-    }
-    return this.nextWorkerNodeId
+  public choose (): number | undefined {
+    this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
+    this.nextWorkerNodeKey = this.leastBusyNextWorkerNodeKey()
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
   public remove (): boolean {
     return true
   }
+
+  private leastBusyNextWorkerNodeKey (): number | undefined {
+    return this.pool.workerNodes.reduce(
+      (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => {
+        return (workerNode.usage.runTime.aggregate ?? 0) +
+          (workerNode.usage.waitTime.aggregate ?? 0) <
+          (workerNodes[minWorkerNodeKey].usage.runTime.aggregate ?? 0) +
+            (workerNodes[minWorkerNodeKey].usage.waitTime.aggregate ?? 0)
+          ? workerNodeKey
+          : minWorkerNodeKey
+      },
+      0
+    )
+  }
 }