X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=7c837ceff3d7b7ca45a5bd9da29feaa70784ef0c;hb=43b84974f72aecd75b4b592e0009359bd5baf228;hp=cbe00a4780792fdcf189d217b29ddcbe2787c853;hpb=465b29401ecddad49070d3b0df4e55dc3902788c;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 cbe00a47..7c837cef 100644
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -57,23 +57,30 @@ export class LeastEluWorkerChoiceStrategy<
 
   /** @inheritDoc */
   public choose (): number {
+    return this.leastEluNextWorkerNodeKey()
+  }
+
+  /** @inheritDoc */
+  public remove (): boolean {
+    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 (workerElu === 0) {
-        this.nextWorkerNodeId = workerNodeKey
+      const workerElu = workerUsage.elu?.active?.aggregate ?? 0
+      if (this.isWorkerNodeReady(workerNodeKey) && workerElu === 0) {
+        this.nextWorkerNodeKey = workerNodeKey
         break
-      } else if (workerElu < minWorkerElu) {
+      } else if (
+        this.isWorkerNodeReady(workerNodeKey) &&
+        workerElu < minWorkerElu
+      ) {
         minWorkerElu = workerElu
-        this.nextWorkerNodeId = workerNodeKey
+        this.nextWorkerNodeKey = workerNodeKey
       }
     }
-    return this.nextWorkerNodeId
-  }
-
-  /** @inheritDoc */
-  public remove (): boolean {
-    return true
+    return this.nextWorkerNodeKey
   }
 }