X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=0f992cfaf82d17794def8c9a129dacf91075f2ec;hb=f6bc9f26d8a0246bbee14b2b03d0bcc41b8aeb52;hp=54d0e7cb054de064d8f9dfbfe074df5f1ba5bbf6;hpb=98e72cda1ce363322fc7ae868b66dec89a1ad74c;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 54d0e7cb..0f992cfa 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,34 @@ export class LeastEluWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
+  public choose (): number | undefined {
+    const chosenWorkerNodeKey = this.leastEluNextWorkerNodeKey()
+    this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+    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
+      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
   }
 }