X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=bc8f8b48746ebf185503455241e94d42e8600552;hb=1416660efeb6aabf366295ebc79067ccc4df9897;hp=39da59a0f2c2d0a16c58e9f4f8b9ce91cc915b92;hpb=d33be4309c69e39da5e81479e40b1a5ec7078bd5;p=poolifier.git

diff --git a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
index 39da59a0..bc8f8b48 100644
--- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/fair-share-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'
@@ -14,8 +17,8 @@ import {
  * Loosely modeled after the fair queueing algorithm: https://en.wikipedia.org/wiki/Fair_queuing.
  *
  * @typeParam Worker - Type of worker which manages the strategy.
- * @typeParam Data - Type of data sent to the worker. This can only be serializable data.
- * @typeParam Response - Type of execution response. This can only be serializable data.
+ * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data.
+ * @typeParam Response - Type of execution response. This can only be structured-cloneable data.
  */
 export class FairShareWorkerChoiceStrategy<
     Worker extends IWorker,
@@ -31,11 +34,7 @@ export class FairShareWorkerChoiceStrategy<
       average: true,
       median: false
     },
-    waitTime: {
-      aggregate: false,
-      average: false,
-      median: false
-    },
+    waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
     elu: {
       aggregate: true,
       average: true,
@@ -66,24 +65,14 @@ export class FairShareWorkerChoiceStrategy<
   /** @inheritDoc */
   public update (workerNodeKey: number): boolean {
     this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
-    let minWorkerVirtualTaskEndTimestamp = Infinity
-    for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
-      if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
-        this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
-      }
-      const workerVirtualTaskEndTimestamp =
-        this.workersVirtualTaskEndTimestamp[workerNodeKey]
-      if (workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp) {
-        minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
-        this.nextWorkerNodeId = workerNodeKey
-      }
-    }
     return true
   }
 
   /** @inheritDoc */
-  public choose (): number {
-    return this.nextWorkerNodeId
+  public choose (): number | undefined {
+    const chosenWorkerNodeKey = this.fairShareNextWorkerNodeKey()
+    this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+    return this.nextWorkerNodeKey
   }
 
   /** @inheritDoc */
@@ -92,6 +81,26 @@ export class FairShareWorkerChoiceStrategy<
     return true
   }
 
+  private fairShareNextWorkerNodeKey (): number | undefined {
+    let minWorkerVirtualTaskEndTimestamp = Infinity
+    let chosenWorkerNodeKey: number | undefined
+    for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
+      if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
+        this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
+      }
+      const workerVirtualTaskEndTimestamp =
+        this.workersVirtualTaskEndTimestamp[workerNodeKey]
+      if (
+        this.isWorkerNodeEligible(workerNodeKey) &&
+        workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp
+      ) {
+        minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
+        chosenWorkerNodeKey = workerNodeKey
+      }
+    }
+    return chosenWorkerNodeKey
+  }
+
   /**
    * Computes the worker node key virtual task end timestamp.
    *