X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=9e18fdc4315fc322f7aabc5e49c92bdaa3a46767;hb=ce63d9e2f3d895bd2ae5aafc40769ff4dda3c887;hp=7c7574fa7a39f55913282a60bd0becf35e88b6fc;hpb=336e91c4a22c1c67f0f1cff28dbbb18bff8d8083;p=poolifier.git diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts index 7c7574fa..9e18fdc4 100644 --- a/src/pools/selection-strategies/worker-choice-strategy-context.ts +++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts @@ -1,21 +1,21 @@ -import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' -import type { IPool } from '../pool' -import type { IWorker } from '../worker' -import { FairShareWorkerChoiceStrategy } from './fair-share-worker-choice-strategy' -import { InterleavedWeightedRoundRobinWorkerChoiceStrategy } from './interleaved-weighted-round-robin-worker-choice-strategy' -import { LeastBusyWorkerChoiceStrategy } from './least-busy-worker-choice-strategy' -import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy' -import { LeastEluWorkerChoiceStrategy } from './least-elu-worker-choice-strategy' -import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy' +import type { IPool } from '../pool.js' +import type { IWorker } from '../worker.js' +import { getWorkerChoiceStrategyRetries } from '../../utils.js' +import { FairShareWorkerChoiceStrategy } from './fair-share-worker-choice-strategy.js' +import { InterleavedWeightedRoundRobinWorkerChoiceStrategy } from './interleaved-weighted-round-robin-worker-choice-strategy.js' +import { LeastBusyWorkerChoiceStrategy } from './least-busy-worker-choice-strategy.js' +import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy.js' +import { LeastEluWorkerChoiceStrategy } from './least-elu-worker-choice-strategy.js' +import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, StrategyPolicy, TaskStatisticsRequirements, WorkerChoiceStrategy, WorkerChoiceStrategyOptions -} from './selection-strategies-types' -import { WorkerChoiceStrategies } from './selection-strategies-types' -import { WeightedRoundRobinWorkerChoiceStrategy } from './weighted-round-robin-worker-choice-strategy' +} from './selection-strategies-types.js' +import { WorkerChoiceStrategies } from './selection-strategies-types.js' +import { WeightedRoundRobinWorkerChoiceStrategy } from './weighted-round-robin-worker-choice-strategy.js' /** * The worker choice strategy context. @@ -29,15 +29,18 @@ export class WorkerChoiceStrategyContext< Data = unknown, Response = unknown > { + /** + * The worker choice strategy instances registered in the context. + */ private readonly workerChoiceStrategies: Map< WorkerChoiceStrategy, IWorkerChoiceStrategy > /** - * The number of times the worker choice strategy in the context has been retried. + * The number of worker choice strategy execution retries. */ - private choiceRetriesCount = 0 + private readonly retries: number /** * Worker choice strategy context constructor. @@ -49,9 +52,8 @@ export class WorkerChoiceStrategyContext< public constructor ( pool: IPool, private workerChoiceStrategy: WorkerChoiceStrategy = WorkerChoiceStrategies.ROUND_ROBIN, - private opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + opts?: WorkerChoiceStrategyOptions ) { - this.opts = { ...DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS, ...opts } this.execute = this.execute.bind(this) this.workerChoiceStrategies = new Map< WorkerChoiceStrategy, @@ -109,6 +111,7 @@ export class WorkerChoiceStrategyContext< >(pool, opts) ] ]) + this.retries = getWorkerChoiceStrategyRetries(pool, opts) } /** @@ -117,11 +120,9 @@ export class WorkerChoiceStrategyContext< * @returns The strategy policy. */ public getStrategyPolicy (): StrategyPolicy { - return ( - this.workerChoiceStrategies.get( - this.workerChoiceStrategy - ) as IWorkerChoiceStrategy - ).strategyPolicy + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return this.workerChoiceStrategies.get(this.workerChoiceStrategy)! + .strategyPolicy } /** @@ -130,11 +131,9 @@ export class WorkerChoiceStrategyContext< * @returns The task statistics requirements. */ public getTaskStatisticsRequirements (): TaskStatisticsRequirements { - return ( - this.workerChoiceStrategies.get( - this.workerChoiceStrategy - ) as IWorkerChoiceStrategy - ).taskStatisticsRequirements + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return this.workerChoiceStrategies.get(this.workerChoiceStrategy)! + .taskStatisticsRequirements } /** @@ -157,37 +156,52 @@ export class WorkerChoiceStrategyContext< * @returns `true` if the update is successful, `false` otherwise. */ public update (workerNodeKey: number): boolean { - return ( - this.workerChoiceStrategies.get( - this.workerChoiceStrategy - ) as IWorkerChoiceStrategy - ).update(workerNodeKey) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return this.workerChoiceStrategies + .get(this.workerChoiceStrategy)! + .update(workerNodeKey) } /** * Executes the worker choice strategy in the context algorithm. * * @returns The key of the worker node. - * @throws {@link https://nodejs.org/api/errors.html#class-error} If after configured retries the worker node key is null or undefined . + * @throws {@link https://nodejs.org/api/errors.html#class-error} If after configured retries the worker node key is null or undefined. */ public execute (): number { - const workerNodeKey = ( - this.workerChoiceStrategies.get( - this.workerChoiceStrategy - ) as IWorkerChoiceStrategy - ).choose() - if ( - workerNodeKey == null && - this.choiceRetriesCount < (this.opts.choiceRetries as number) - ) { - this.choiceRetriesCount++ + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const workerChoiceStrategy = this.workerChoiceStrategies.get( + this.workerChoiceStrategy + )! + if (!workerChoiceStrategy.hasPoolWorkerNodesReady()) { return this.execute() - } else if (workerNodeKey == null) { + } + return this.executeStrategy(workerChoiceStrategy) + } + + /** + * Executes the given worker choice strategy. + * + * @param workerChoiceStrategy - The worker choice strategy. + * @returns The key of the worker node. + * @throws {@link https://nodejs.org/api/errors.html#class-error} If after configured retries the worker node key is null or undefined. + */ + private executeStrategy (workerChoiceStrategy: IWorkerChoiceStrategy): number { + let workerNodeKey: number | undefined + let chooseCount = 0 + let retriesCount = 0 + do { + workerNodeKey = workerChoiceStrategy.choose() + if (workerNodeKey == null && chooseCount > 0) { + retriesCount++ + } + chooseCount++ + } while (workerNodeKey == null && retriesCount < this.retries) + if (workerNodeKey == null) { throw new Error( - `Worker node key chosen is null or undefined after ${this.choiceRetriesCount} retries` + `Worker node key chosen is null or undefined after ${retriesCount} retries` ) } - this.choiceRetriesCount = 0 return workerNodeKey } @@ -198,11 +212,10 @@ export class WorkerChoiceStrategyContext< * @returns `true` if the removal is successful, `false` otherwise. */ public remove (workerNodeKey: number): boolean { - return ( - this.workerChoiceStrategies.get( - this.workerChoiceStrategy - ) as IWorkerChoiceStrategy - ).remove(workerNodeKey) + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + return this.workerChoiceStrategies + .get(this.workerChoiceStrategy)! + .remove(workerNodeKey) } /** @@ -210,8 +223,7 @@ export class WorkerChoiceStrategyContext< * * @param opts - The worker choice strategy options. */ - public setOptions (opts: WorkerChoiceStrategyOptions): void { - this.opts = { ...DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS, ...opts } + public setOptions (opts: WorkerChoiceStrategyOptions | undefined): void { for (const workerChoiceStrategy of this.workerChoiceStrategies.values()) { workerChoiceStrategy.setOptions(opts) }