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=763abb1c8e61ceb4f69c3488839a95d056cb84f0;hp=e8f9cc619f6a7f0d8ffc596332e27a9159c72e01;hpb=67f3f2d6cb8f915ec71f81c4533ab80a6c6a6f0f;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 e8f9cc61..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,12 +1,12 @@ -import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils.js' 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, - type InternalWorkerChoiceStrategyOptions, Measurements, - type TaskStatisticsRequirements + type TaskStatisticsRequirements, + type WorkerChoiceStrategyOptions } from './selection-strategies-types.js' /** @@ -42,7 +42,7 @@ export class FairShareWorkerChoiceStrategy< /** @inheritDoc */ public constructor ( pool: IPool, - opts: InternalWorkerChoiceStrategyOptions + opts?: WorkerChoiceStrategyOptions ) { super(pool, opts) this.setTaskStatisticsRequirements(this.opts) @@ -78,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) { @@ -118,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