refactor: sensible defaults for worker choice strategy policy

[poolifier.git] / src / pools / selection-strategies / least-busy-worker-choice-strategy.ts

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 7e9d581421319919e865c809df85d06f3c6e305c..224ca540130f49c37e6b28d5de471e5237dddb14 100644 (file)
--- a/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-busy-worker-choice-strategy.ts
@@ -60,25 +60,35 @@ export class LeastBusyWorkerChoiceStrategy<
   }
 
   /** @inheritDoc */
-  public choose (): number {
+  public choose (): number | undefined {
+    const chosenWorkerNodeKey = this.leastBusyNextWorkerNodeKey()
+    this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+    return this.nextWorkerNodeKey
+  }
+
+  /** @inheritDoc */
+  public remove (): boolean {
+    return true
+  }
+
+  private leastBusyNextWorkerNodeKey (): number | undefined {
     let minTime = Infinity
+    let chosenWorkerNodeKey: number | undefined
     for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) {
       const workerTime =
-        workerNode.workerUsage.runTime.aggregate +
-        workerNode.workerUsage.waitTime.aggregate
-      if (workerTime === 0) {
-        this.nextWorkerNodeId = workerNodeKey
+        (workerNode.usage.runTime?.aggregate ?? 0) +
+        (workerNode.usage.waitTime?.aggregate ?? 0)
+      if (this.isWorkerNodeEligible(workerNodeKey) && workerTime === 0) {
+        chosenWorkerNodeKey = workerNodeKey
         break
-      } else if (workerTime < minTime) {
+      } else if (
+        this.isWorkerNodeEligible(workerNodeKey) &&
+        workerTime < minTime
+      ) {
         minTime = workerTime
-        this.nextWorkerNodeId = workerNodeKey
+        chosenWorkerNodeKey = workerNodeKey
       }
     }
-    return this.nextWorkerNodeId
-  }
-
-  /** @inheritDoc */
-  public remove (): boolean {
-    return true
+    return chosenWorkerNodeKey
   }
 }