X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fleast-elu-worker-choice-strategy.ts;h=cbe00a4780792fdcf189d217b29ddcbe2787c853;hb=7afd4514165c3cbb3435e230654643c389990a3f;hp=5df742a665d5d9b5ed838beb887e426da43ade07;hpb=5ea80606520ed06f815f4f7485ec9057ac23b176;p=poolifier.git diff --git a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts index 5df742a6..cbe00a47 100644 --- a/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/least-elu-worker-choice-strategy.ts @@ -1,4 +1,7 @@ -import { DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS } from '../../utils' +import { + DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS +} from '../../utils' import type { IPool } from '../pool' import type { IWorker } from '../worker' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy' @@ -12,8 +15,8 @@ import type { * Selects the worker with the least ELU. * * @typeParam Worker - Type of worker which manages the strategy. - * @typeParam Data - Type of data sent to the worker. This can only be serializable data. - * @typeParam Response - Type of execution response. This can only be serializable data. + * @typeParam Data - Type of data sent to the worker. This can only be structured-cloneable data. + * @typeParam Response - Type of execution response. This can only be structured-cloneable data. */ export class LeastEluWorkerChoiceStrategy< Worker extends IWorker, @@ -24,16 +27,8 @@ export class LeastEluWorkerChoiceStrategy< implements IWorkerChoiceStrategy { /** @inheritDoc */ public readonly taskStatisticsRequirements: TaskStatisticsRequirements = { - runTime: { - aggregate: false, - average: false, - median: false - }, - waitTime: { - aggregate: false, - average: false, - median: false - }, + runTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, + waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS, elu: { aggregate: true, average: false, @@ -57,9 +52,14 @@ export class LeastEluWorkerChoiceStrategy< /** @inheritDoc */ public update (): boolean { + return true + } + + /** @inheritDoc */ + public choose (): number { let minWorkerElu = Infinity for (const [workerNodeKey, workerNode] of this.pool.workerNodes.entries()) { - const workerUsage = workerNode.workerUsage + const workerUsage = workerNode.usage const workerElu = workerUsage.elu?.active.aggregate ?? 0 if (workerElu === 0) { this.nextWorkerNodeId = workerNodeKey @@ -69,11 +69,6 @@ export class LeastEluWorkerChoiceStrategy< this.nextWorkerNodeId = workerNodeKey } } - return true - } - - /** @inheritDoc */ - public choose (): number { return this.nextWorkerNodeId }