X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=00919f33f58f5878fd381692bfb2009f2c5b611c;hb=df7349e2151c2e46d0bf2c406a5d8bd14d1ed2bf;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..00919f33 100644
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -56,24 +56,33 @@ export class LeastEluWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
+  public choose (): number | undefined {
+    this.nextWorkerNodeKey = this.leastEluNextWorkerNodeKey()
+    return this.nextWorkerNodeKey
+  }
+
+  /** @inheritDoc */
+  public remove (): boolean {
+    return true
+  }
+
+  private leastEluNextWorkerNodeKey (): number | undefined {
     let minWorkerElu = Infinity
+    let chosenWorkerNodeKey: number | undefined
     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.isWorkerNodeEligible(workerNodeKey) && workerElu === 0) {
+        chosenWorkerNodeKey = workerNodeKey
         break
-      } else if (workerElu < minWorkerElu) {
+      } else if (
+        this.isWorkerNodeEligible(workerNodeKey) &&
+        workerElu < minWorkerElu
+      ) {
         minWorkerElu = workerElu
-        this.nextWorkerNodeId = workerNodeKey
+        chosenWorkerNodeKey = workerNodeKey
       }
     }
-    return this.nextWorkerNodeId
-  }
-
-  /** @inheritDoc */
-  public remove (): boolean {
-    return true
+    return chosenWorkerNodeKey
   }
 }