Merge branch 'master' of github.com:jerome-benoit/poolifier

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

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 8394ae7c303144a93855425fe360902774f71bf3..7c837ceff3d7b7ca45a5bd9da29feaa70784ef0c 100644 (file)
--- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts
@@ -1,4 +1,7 @@
-import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils'
+import {
+  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+} from '../../utils'
 import type { IPool } from '../pool'
 import type { IWorker } from '../worker'
 import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
@@ -24,16 +27,8 @@ export class LeastEluWorkerChoiceStrategy<
   implements IWorkerChoiceStrategy {
   /** @inheritDoc */
   public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
-    runTime: {
-      aggregate: false,
-      average: false,
-      median: false
-    },
-    waitTime: {
-      aggregate: false,
-      average: false,
-      median: false
-    },
+    runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
     elu: {
       aggregate: true,
       average: false,
@@ -62,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.workerUsage
-      const workerElu = workerUsage.elu?.active.aggregate ?? 0
-      if (workerElu === 0) {
-        this.nextWorkerNodeId = workerNodeKey
+      const workerUsage = workerNode.usage
+      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
   }
 }