refactor: cleanup worker selection strategies code

Signed-off-by: Jérôme Benoit <[email protected]>

Author: jerome-benoit

src/pools/selection-strategies/abstract-worker-choice-strategy.ts

@@ -47,9 +47,9 @@ export abstract class AbstractWorkerChoiceStrategy<
   /** @inheritDoc */
   public readonly taskStatisticsRequirements: TaskStatisticsRequirements =
     Object.freeze({
-      runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
-      waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
-      elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+      runTime: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
+      waitTime: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
+      elu: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
     })
 
   /**
@@ -186,7 +186,9 @@ export abstract class AbstractWorkerChoiceStrategy<
    * @param workerNodeKey - The worker node key.
    */
   protected setPreviousWorkerNodeKey(workerNodeKey: number | undefined): void {
-    this.previousWorkerNodeKey = workerNodeKey != null && workerNodeKey >= 0
+    this.previousWorkerNodeKey = workerNodeKey != null &&
+        workerNodeKey >= 0 &&
+        workerNodeKey < this.pool.workerNodes.length
       ? workerNodeKey
       : this.previousWorkerNodeKey
   }

src/pools/selection-strategies/fair-share-worker-choice-strategy.ts

@@ -68,6 +68,7 @@ export class FairShareWorkerChoiceStrategy<
   /** @inheritDoc */
   public update(workerNodeKey: number): boolean {
     this.pool.workerNodes[workerNodeKey].strategyData = {
+      ...this.pool.workerNodes[workerNodeKey].strategyData,
       virtualTaskEndTimestamp: this.computeWorkerNodeVirtualTaskEndTimestamp(
         workerNodeKey,
       ),
@@ -103,13 +104,15 @@ export class FairShareWorkerChoiceStrategy<
         }
         if (minWorkerNodeKey === -1) {
           workerNode.strategyData = {
+            ...workerNode.strategyData,
             virtualTaskEndTimestamp: this
               .computeWorkerNodeVirtualTaskEndTimestamp(workerNodeKey),
           }
           return workerNodeKey
         }
         if (workerNode.strategyData?.virtualTaskEndTimestamp == null) {
           workerNode.strategyData = {
+            ...workerNode.strategyData,
             virtualTaskEndTimestamp: this
               .computeWorkerNodeVirtualTaskEndTimestamp(workerNodeKey),
           }

src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts

@@ -40,7 +40,7 @@ export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
         average: true,
         median: false,
       },
-      elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+      elu: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
     })
 
   /**

src/pools/selection-strategies/least-busy-worker-choice-strategy.ts

@@ -39,7 +39,7 @@ export class LeastBusyWorkerChoiceStrategy<
         average: false,
         median: false,
       },
-      elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+      elu: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
     })
 
   /** @inheritDoc */

src/pools/selection-strategies/least-elu-worker-choice-strategy.ts

@@ -29,7 +29,7 @@ export class LeastEluWorkerChoiceStrategy<
   /** @inheritDoc */
   public override readonly taskStatisticsRequirements:
     TaskStatisticsRequirements = Object.freeze({
-      runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+      runTime: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
       waitTime: {
         aggregate: true,
         average: false,

src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts

@@ -41,7 +41,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy<
         average: true,
         median: false,
       },
-      elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+      elu: { ...DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS },
     })
 
   /**

src/pools/selection-strategies/worker-choice-strategies-context.ts

@@ -179,7 +179,7 @@ export class WorkerChoiceStrategiesContext<
     }
     if (workerNodeKey == null) {
       throw new Error(
-        `Worker node key chosen by ${workerChoiceStrategy.name} is null or undefined after ${retriesCount.toString()} retries`,
+        `Worker node key chosen by ${workerChoiceStrategy.name} is null or undefined after ${retriesCount.toString()} retries (max: ${this.retries.toString()})`,
       )
     }
     return workerNodeKey

tests/pools/selection-strategies/worker-choice-strategies-context.test.mjs

@@ -93,7 +93,7 @@ describe('Worker choice strategies context test suite', () => {
     )
     expect(() => workerChoiceStrategiesContext.execute()).toThrow(
       new Error(
-        `Worker node key chosen by ${workerChoiceStrategyUndefinedStub.name} is null or undefined after ${workerChoiceStrategiesContext.retries} retries`,
+        `Worker node key chosen by ${workerChoiceStrategyUndefinedStub.name} is null or undefined after ${workerChoiceStrategiesContext.retries.toString()} retries (max: ${workerChoiceStrategiesContext.retries.toString()})`,
       ),
     )
     workerChoiceStrategyUndefinedStub.choose.restore()
@@ -111,7 +111,7 @@ describe('Worker choice strategies context test suite', () => {
     )
     expect(() => workerChoiceStrategiesContext.execute()).toThrow(
       new Error(
-        `Worker node key chosen by ${workerChoiceStrategyNullStub.name} is null or undefined after ${workerChoiceStrategiesContext.retries} retries`,
+        `Worker node key chosen by ${workerChoiceStrategyNullStub.name} is null or undefined after ${workerChoiceStrategiesContext.retries.toString()} retries (max: ${workerChoiceStrategiesContext.retries.toString()})`,
       ),
     )
     workerChoiceStrategyNullStub.choose.restore()