X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-busy-worker-choice-strategy.ts;h=91fbfc782579f83950482ba71019c9197e5e6348;hb=946b809b91118cd7442b90971344e53e15c26466;hp=338ae379d2663e3777366353691bdc5ab8639592;hpb=9fe8fd698590c2494dc6793cfd8c08026fe88a31;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 338ae379..91fbfc78 100644
--- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@ -61,6 +61,7 @@ export class LeastBusyWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number | undefined {
+    this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
     this.nextWorkerNodeKey = this.leastBusyNextWorkerNodeKey()
     return this.nextWorkerNodeKey
   }
@@ -71,23 +72,16 @@ export class LeastBusyWorkerChoiceStrategy<
   }
 
   private leastBusyNextWorkerNodeKey (): number | undefined {
-    let minTime = Infinity
-    let chosenWorkerNodeKey: number | undefined
-    for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
-      if (!this.isWorkerNodeEligible(workerNodeKey)) {
-        continue
-      }
-      const workerTime =
-        (workerNode.usage.runTime?.aggregate ?? 0) +
-        (workerNode.usage.waitTime?.aggregate ?? 0)
-      if (workerTime === 0) {
-        chosenWorkerNodeKey = workerNodeKey
-        break
-      } else if (workerTime < minTime) {
-        minTime = workerTime
-        chosenWorkerNodeKey = workerNodeKey
-      }
-    }
-    return chosenWorkerNodeKey
+    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
+    )
   }
 }