X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=a060cea3a5ba4486059fec1f6b45dac515f155e3;hb=dc32abbbbd36504ce933a0403cc245899c25a828;hp=6e798fbc4349d98bf5b5761d884013382efa601f;hpb=a77ac8fcba99a9580ff6524d70d2fab7dbdd448d;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 6e798fbc..a060cea3 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -4,7 +4,8 @@ import type { IPool } from '../pool' import type { IWorker } from '../worker' import type { IWorkerChoiceStrategy, - RequiredStatistics, + StrategyPolicy, + TaskStatisticsRequirements, WorkerChoiceStrategyOptions } from './selection-strategies-types' @@ -24,14 +25,29 @@ export abstract class AbstractWorkerChoiceStrategy< * Toggles finding the last free worker node key. */ private toggleFindLastFreeWorkerNodeKey: boolean = false + /** @inheritDoc */ - public readonly requiredStatistics: RequiredStatistics = { - runTime: false, - avgRunTime: false, - medRunTime: false, - waitTime: false, - avgWaitTime: false, - medWaitTime: false + public readonly strategyPolicy: StrategyPolicy = { + useDynamicWorker: false + } + + /** @inheritDoc */ + public readonly taskStatisticsRequirements: TaskStatisticsRequirements = { + runTime: { + aggregate: false, + average: false, + median: false + }, + waitTime: { + aggregate: false, + average: false, + median: false + }, + elu: { + aggregate: false, + average: false, + median: false + } } /** @@ -47,22 +63,54 @@ export abstract class AbstractWorkerChoiceStrategy< this.choose = this.choose.bind(this) } - protected setRequiredStatistics (opts: WorkerChoiceStrategyOptions): void { - if (this.requiredStatistics.avgRunTime && opts.medRunTime === true) { - this.requiredStatistics.avgRunTime = false - this.requiredStatistics.medRunTime = opts.medRunTime as boolean + protected setTaskStatisticsRequirements ( + opts: WorkerChoiceStrategyOptions + ): void { + if ( + this.taskStatisticsRequirements.runTime.average && + opts.runTime?.median === true + ) { + this.taskStatisticsRequirements.runTime.average = false + this.taskStatisticsRequirements.runTime.median = opts.runTime + .median as boolean } - if (this.requiredStatistics.medRunTime && opts.medRunTime === false) { - this.requiredStatistics.avgRunTime = true - this.requiredStatistics.medRunTime = opts.medRunTime as boolean + if ( + this.taskStatisticsRequirements.runTime.median && + opts.runTime?.median === false + ) { + this.taskStatisticsRequirements.runTime.average = true + this.taskStatisticsRequirements.runTime.median = opts.runTime + .median as boolean } - if (this.requiredStatistics.avgWaitTime && opts.medWaitTime === true) { - this.requiredStatistics.avgWaitTime = false - this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + if ( + this.taskStatisticsRequirements.waitTime.average && + opts.waitTime?.median === true + ) { + this.taskStatisticsRequirements.waitTime.average = false + this.taskStatisticsRequirements.waitTime.median = opts.waitTime + .median as boolean } - if (this.requiredStatistics.medWaitTime && opts.medWaitTime === false) { - this.requiredStatistics.avgWaitTime = true - this.requiredStatistics.medWaitTime = opts.medWaitTime as boolean + if ( + this.taskStatisticsRequirements.waitTime.median && + opts.waitTime?.median === false + ) { + this.taskStatisticsRequirements.waitTime.average = true + this.taskStatisticsRequirements.waitTime.median = opts.waitTime + .median as boolean + } + if ( + this.taskStatisticsRequirements.elu.average && + opts.elu?.median === true + ) { + this.taskStatisticsRequirements.elu.average = false + this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean + } + if ( + this.taskStatisticsRequirements.elu.median && + opts.elu?.median === false + ) { + this.taskStatisticsRequirements.elu.average = true + this.taskStatisticsRequirements.elu.median = opts.elu.median as boolean } } @@ -81,7 +129,7 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public setOptions (opts: WorkerChoiceStrategyOptions): void { opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS - this.setRequiredStatistics(opts) + this.setTaskStatisticsRequirements(opts) this.opts = opts } @@ -101,30 +149,44 @@ export abstract class AbstractWorkerChoiceStrategy< /** * Gets the worker task runtime. - * If the required statistics are `avgRunTime`, the average runtime is returned. - * If the required statistics are `medRunTime`, the median runtime is returned. + * 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. * * @param workerNodeKey - The worker node key. * @returns The worker task runtime. */ protected getWorkerTaskRunTime (workerNodeKey: number): number { - return this.requiredStatistics.medRunTime - ? this.pool.workerNodes[workerNodeKey].tasksUsage.medRunTime - : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime + return this.taskStatisticsRequirements.runTime.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median + : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average } /** * Gets the worker task wait time. - * If the required statistics are `avgWaitTime`, the average wait time is returned. - * If the required statistics are `medWaitTime`, the median wait time is returned. + * If the task statistics require the average wait time, the average wait time is returned. + * If the task statistics require the median wait time, the median wait time is returned. * * @param workerNodeKey - The worker node key. * @returns The worker task wait time. */ - protected getWorkerWaitTime (workerNodeKey: number): number { - return this.requiredStatistics.medWaitTime - ? this.pool.workerNodes[workerNodeKey].tasksUsage.medWaitTime - : this.pool.workerNodes[workerNodeKey].tasksUsage.avgWaitTime + protected getWorkerTaskWaitTime (workerNodeKey: number): number { + return this.taskStatisticsRequirements.waitTime.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.runTime.median + : this.pool.workerNodes[workerNodeKey].workerUsage.runTime.average + } + + /** + * Gets the worker task ELU. + * If the task statistics require the average ELU, the average ELU is returned. + * If the task statistics require the median ELU, the median ELU is returned. + * + * @param workerNodeKey - The worker node key. + * @returns The worker task ELU. + */ + protected getWorkerTaskElu (workerNodeKey: number): number { + return this.taskStatisticsRequirements.elu.median + ? this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.median + : this.pool.workerNodes[workerNodeKey].workerUsage.elu.active.average } protected computeDefaultWorkerWeight (): number { @@ -141,7 +203,7 @@ export abstract class AbstractWorkerChoiceStrategy< /** * Finds the first free worker node key based on the number of tasks the worker has applied. * - * If a worker is found with `0` running tasks, it is detected as free and its worker node key is returned. + * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. * * If no free worker is found, `-1` is returned. * @@ -149,14 +211,14 @@ export abstract class AbstractWorkerChoiceStrategy< */ private findFirstFreeWorkerNodeKey (): number { return this.pool.workerNodes.findIndex(workerNode => { - return workerNode.tasksUsage.running === 0 + return workerNode.workerUsage.tasks.executing === 0 }) } /** * Finds the last free worker node key based on the number of tasks the worker has applied. * - * If a worker is found with `0` running tasks, it is detected as free and its worker node key is returned. + * If a worker is found with `0` executing tasks, it is detected as free and its worker node key is returned. * * If no free worker is found, `-1` is returned. * @@ -165,14 +227,16 @@ export abstract class AbstractWorkerChoiceStrategy< private findLastFreeWorkerNodeKey (): number { // It requires node >= 18.0.0: // return this.workerNodes.findLastIndex(workerNode => { - // return workerNode.tasksUsage.running === 0 + // return workerNode.workerUsage.tasks.executing === 0 // }) for ( let workerNodeKey = this.pool.workerNodes.length - 1; workerNodeKey >= 0; workerNodeKey-- ) { - if (this.pool.workerNodes[workerNodeKey].tasksUsage.running === 0) { + if ( + this.pool.workerNodes[workerNodeKey].workerUsage.tasks.executing === 0 + ) { return workerNodeKey } }