X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=0fe9cbec0275513ee8d6feed443915cf77536f07;hb=facb41d7d33bd6c11970da5e946c51347824fd54;hp=7c837ceff3d7b7ca45a5bd9da29feaa70784ef0c;hpb=20016c79549983d09d30b70852ec7fae515d4156;p=poolifier.git

diff --git a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
index 7c837cef..0fe9cbec 100644
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -56,8 +56,10 @@ export class LeastEluWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
-    return this.leastEluNextWorkerNodeKey()
+  public choose (): number | undefined {
+    this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
+    this.nextWorkerNodeKey = this.leastEluNextWorkerNodeKey()
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
@@ -65,22 +67,15 @@ export class LeastEluWorkerChoiceStrategy<
     return true
   }
 
-  private leastEluNextWorkerNodeKey (): number {
-    let minWorkerElu = Infinity
-    for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
-      const workerUsage = workerNode.usage
-      const workerElu = workerUsage.elu?.active?.aggregate ?? 0
-      if (this.isWorkerNodeReady(workerNodeKey) && workerElu === 0) {
-        this.nextWorkerNodeKey = workerNodeKey
-        break
-      } else if (
-        this.isWorkerNodeReady(workerNodeKey) &&
-        workerElu < minWorkerElu
-      ) {
-        minWorkerElu = workerElu
-        this.nextWorkerNodeKey = workerNodeKey
-      }
-    }
-    return this.nextWorkerNodeKey
+  private leastEluNextWorkerNodeKey (): number | undefined {
+    return this.pool.workerNodes.reduce(
+      (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => {
+        return (workerNode.usage.elu.active.aggregate ?? 0) <
+          (workerNodes[minWorkerNodeKey].usage.elu.active.aggregate ?? 0)
+          ? workerNodeKey
+          : minWorkerNodeKey
+      },
+      0
+    )
   }
 }