X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=fb3bf707386f8bdb2bb9aac23ccf6db9d851ac96;hb=f6bc9f26d8a0246bbee14b2b03d0bcc41b8aeb52;hp=9c20c5bea63143f3b3e556f2629b635026e32a2a;hpb=57441b795f8680adcdfe1a58882d54fb41cce970;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 9c20c5be..fb3bf707 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -28,11 +28,17 @@ export abstract class AbstractWorkerChoiceStrategy< /** * The next worker node key. */ - protected nextWorkerNodeKey: number = 0 + protected nextWorkerNodeKey: number | undefined = 0 + + /** + * The previous worker node key. + */ + protected previousWorkerNodeKey: number = 0 /** @inheritDoc */ public readonly strategyPolicy: StrategyPolicy = { - useDynamicWorker: false + dynamicWorkerUsage: false, + dynamicWorkerReady: true } /** @inheritDoc */ @@ -52,6 +58,7 @@ export abstract class AbstractWorkerChoiceStrategy< protected readonly pool: IPool, protected opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS ) { + this.opts = { ...DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS, ...opts } this.choose = this.choose.bind(this) } @@ -93,14 +100,14 @@ export abstract class AbstractWorkerChoiceStrategy< public abstract update (workerNodeKey: number): boolean /** @inheritDoc */ - public abstract choose (): number + public abstract choose (): number | undefined /** @inheritDoc */ public abstract remove (workerNodeKey: number): boolean /** @inheritDoc */ public setOptions (opts: WorkerChoiceStrategyOptions): void { - this.opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS + this.opts = { ...DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS, ...opts } this.setTaskStatisticsRequirements(this.opts) } @@ -110,10 +117,36 @@ export abstract class AbstractWorkerChoiceStrategy< * @param workerNodeKey - The worker node key. * @returns Whether the worker node is ready or not. */ - protected isWorkerNodeReady (workerNodeKey: number): boolean { + private isWorkerNodeReady (workerNodeKey: number): boolean { return this.pool.workerNodes[workerNodeKey].info.ready } + /** + * Whether the worker node has back pressure or not (i.e. its tasks queue is full). + * + * @param workerNodeKey - The worker node key. + * @returns `true` if the worker node has back pressure, `false` otherwise. + */ + private hasWorkerNodeBackPressure (workerNodeKey: number): boolean { + return this.pool.hasWorkerNodeBackPressure(workerNodeKey) + } + + /** + * Whether the worker node is eligible or not. + * A worker node is eligible if it is ready and does not have back pressure. + * + * @param workerNodeKey - The worker node key. + * @returns `true` if the worker node is eligible, `false` otherwise. + * @see {@link isWorkerNodeReady} + * @see {@link hasWorkerNodeBackPressure} + */ + protected isWorkerNodeEligible (workerNodeKey: number): boolean { + return ( + this.isWorkerNodeReady(workerNodeKey) && + !this.hasWorkerNodeBackPressure(workerNodeKey) + ) + } + /** * Gets the worker task runtime. * If the task statistics require the average runtime, the average runtime is returned. @@ -156,6 +189,21 @@ export abstract class AbstractWorkerChoiceStrategy< : this.pool.workerNodes[workerNodeKey].usage.elu.active?.average ?? 0 } + /** + * Assign to nextWorkerNodeKey property the chosen worker node key. + * + * @param chosenWorkerNodeKey - The chosen worker node key. + */ + protected assignChosenWorkerNodeKey ( + chosenWorkerNodeKey: number | undefined + ): void { + if (chosenWorkerNodeKey != null) { + this.nextWorkerNodeKey = chosenWorkerNodeKey + } else { + this.nextWorkerNodeKey = undefined + } + } + protected computeDefaultWorkerWeight (): number { let cpusCycleTimeWeight = 0 for (const cpu of cpus()) {