X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=ee617d36253cac9c6e8b0970725b139c1ad5b1a5;hb=76ae94ffbe0d293daee778f0e885866242059450;hp=a337278ba9ce75a074c1b32d751d8f928ec86496;hpb=f201a0cd2575be684ab0f291c8590eec538038e0;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 a337278b..ee617d36 100644
--- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@ -1,16 +1,13 @@
-import {
-  DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
-  DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
-} from '../../utils'
-import type { IPool } from '../pool'
-import type { IWorker, StrategyData } from '../worker'
-import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
+import type { IPool } from '../pool.js'
+import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js'
+import type { IWorker } from '../worker.js'
+import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js'
 import {
   type IWorkerChoiceStrategy,
   Measurements,
   type TaskStatisticsRequirements,
   type WorkerChoiceStrategyOptions
-} from './selection-strategies-types'
+} from './selection-strategies-types.js'
 
 /**
  * Selects the next worker with a fair share scheduling algorithm.
@@ -45,7 +42,7 @@ export class FairShareWorkerChoiceStrategy<
   /** @inheritDoc */
   public constructor (
     pool: IPool<Worker, Data, Response>,
-    opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+    opts?: WorkerChoiceStrategyOptions
   ) {
     super(pool, opts)
     this.setTaskStatisticsRequirements(this.opts)
@@ -81,6 +78,9 @@ export class FairShareWorkerChoiceStrategy<
   }
 
   private fairShareNextWorkerNodeKey (): number | undefined {
+    if (this.pool.workerNodes.length === 0) {
+      return undefined
+    }
     return this.pool.workerNodes.reduce(
       (minWorkerNodeKey, workerNode, workerNodeKey, workerNodes) => {
         if (workerNode.strategyData?.virtualTaskEndTimestamp == null) {
@@ -89,9 +89,11 @@ export class FairShareWorkerChoiceStrategy<
               this.computeWorkerNodeVirtualTaskEndTimestamp(workerNodeKey)
           }
         }
-        return (workerNode.strategyData.virtualTaskEndTimestamp as number) <
-          ((workerNodes[minWorkerNodeKey].strategyData as StrategyData)
-            .virtualTaskEndTimestamp as number)
+        return this.isWorkerNodeReady(workerNodeKey) &&
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          workerNode.strategyData.virtualTaskEndTimestamp! <
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            workerNodes[minWorkerNodeKey].strategyData!.virtualTaskEndTimestamp!
           ? workerNodeKey
           : minWorkerNodeKey
       },
@@ -119,7 +121,8 @@ export class FairShareWorkerChoiceStrategy<
     workerNodeVirtualTaskStartTimestamp: number
   ): number {
     const workerNodeTaskRunTime =
-      this.opts.measurement === Measurements.elu
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      this.opts!.measurement === Measurements.elu
         ? this.getWorkerNodeTaskElu(workerNodeKey)
         : this.getWorkerNodeTaskRunTime(workerNodeKey)
     return workerNodeVirtualTaskStartTimestamp + workerNodeTaskRunTime
@@ -133,7 +136,8 @@ export class FairShareWorkerChoiceStrategy<
         ?.virtualTaskEndTimestamp
     const now = performance.now()
     return now < (virtualTaskEndTimestamp ?? -Infinity)
-      ? (virtualTaskEndTimestamp as number)
+      ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      virtualTaskEndTimestamp!
       : now
   }
 }