X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=2b40f0c6de497a630808fbffe6a9ec3f59039e91;hb=e75373e6b8ed2882c1b8dd7eedc8ca9217582121;hp=0a2b6113b8451bfabfd7fc866d59cc71b2f95ef2;hpb=04d875a3942abe97ce35c177c6e6f41619be974b;p=poolifier.git diff --git a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts index 0a2b6113..2b40f0c6 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -1,16 +1,16 @@ -import { - DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, - buildWorkerChoiceStrategyOptions -} from '../../utils.js' import type { IPool } from '../pool.js' +import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js' import type { IWorker } from '../worker.js' import type { IWorkerChoiceStrategy, - MeasurementStatisticsRequirements, StrategyPolicy, TaskStatisticsRequirements, WorkerChoiceStrategyOptions } from './selection-strategies-types.js' +import { + buildWorkerChoiceStrategyOptions, + toggleMedianMeasurementStatisticsRequirements +} from './selection-strategies-utils.js' /** * Worker choice strategy abstract base class. @@ -32,7 +32,7 @@ export abstract class AbstractWorkerChoiceStrategy< /** * The previous worker node key. */ - protected previousWorkerNodeKey: number = 0 + protected previousWorkerNodeKey = 0 /** @inheritDoc */ public readonly strategyPolicy: StrategyPolicy = { @@ -64,37 +64,23 @@ export abstract class AbstractWorkerChoiceStrategy< protected setTaskStatisticsRequirements ( opts: WorkerChoiceStrategyOptions | undefined ): void { - this.toggleMedianMeasurementStatisticsRequirements( + toggleMedianMeasurementStatisticsRequirements( this.taskStatisticsRequirements.runTime, // eslint-disable-next-line @typescript-eslint/no-non-null-assertion opts!.runTime!.median ) - this.toggleMedianMeasurementStatisticsRequirements( + toggleMedianMeasurementStatisticsRequirements( this.taskStatisticsRequirements.waitTime, // eslint-disable-next-line @typescript-eslint/no-non-null-assertion opts!.waitTime!.median ) - this.toggleMedianMeasurementStatisticsRequirements( + toggleMedianMeasurementStatisticsRequirements( this.taskStatisticsRequirements.elu, // eslint-disable-next-line @typescript-eslint/no-non-null-assertion opts!.elu!.median ) } - private toggleMedianMeasurementStatisticsRequirements ( - measurementStatisticsRequirements: MeasurementStatisticsRequirements, - toggleMedian: boolean - ): void { - if (measurementStatisticsRequirements.average && toggleMedian) { - measurementStatisticsRequirements.average = false - measurementStatisticsRequirements.median = toggleMedian - } - if (measurementStatisticsRequirements.median && !toggleMedian) { - measurementStatisticsRequirements.average = true - measurementStatisticsRequirements.median = toggleMedian - } - } - protected resetWorkerNodeKeyProperties (): void { this.nextWorkerNodeKey = 0 this.previousWorkerNodeKey = 0 @@ -132,11 +118,14 @@ export abstract class AbstractWorkerChoiceStrategy< } /** - * Check the next worker node readiness. + * Check the next worker node key. */ - protected checkNextWorkerNodeReadiness (): void { - // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - if (!this.isWorkerNodeReady(this.nextWorkerNodeKey!)) { + protected checkNextWorkerNodeKey (): void { + if ( + this.nextWorkerNodeKey != null && + (this.nextWorkerNodeKey < 0 || + !this.isWorkerNodeReady(this.nextWorkerNodeKey)) + ) { delete this.nextWorkerNodeKey } } @@ -144,7 +133,7 @@ export abstract class AbstractWorkerChoiceStrategy< /** * Gets the worker node task runtime. * If the task statistics require the average runtime, the average runtime is returned. - * If the task statistics require the median runtime , the median runtime is returned. + * If the task statistics require the median runtime, the median runtime is returned. * * @param workerNodeKey - The worker node key. * @returns The worker node task runtime. @@ -189,6 +178,9 @@ export abstract class AbstractWorkerChoiceStrategy< * @param workerNodeKey - The worker node key. */ protected setPreviousWorkerNodeKey (workerNodeKey: number | undefined): void { - this.previousWorkerNodeKey = workerNodeKey ?? this.previousWorkerNodeKey + this.previousWorkerNodeKey = + workerNodeKey != null && workerNodeKey >= 0 + ? workerNodeKey + : this.previousWorkerNodeKey } }