X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fabstract-worker-choice-strategy.ts;h=c3fb28c4f1e162185f65e08029c886e8df826d99;hb=0509fd43c1e920aed11ba50293062eaf167bef44;hp=e2dd626de76106991b11d1567d70c9e6f3d21ab7;hpb=a4958de2101f06e7096b83adbca82fcfd532a721;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 e2dd626d..c3fb28c4 100644 --- a/src/pools/selection-strategies/abstract-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/abstract-worker-choice-strategy.ts @@ -43,7 +43,7 @@ export abstract class AbstractWorkerChoiceStrategy< this.choose = this.choose.bind(this) } - protected checkOptions (opts: WorkerChoiceStrategyOptions): void { + protected setRequiredStatistics (opts: WorkerChoiceStrategyOptions): void { if (this.requiredStatistics.avgRunTime && opts.medRunTime === true) { this.requiredStatistics.avgRunTime = false this.requiredStatistics.medRunTime = opts.medRunTime as boolean @@ -52,14 +52,6 @@ export abstract class AbstractWorkerChoiceStrategy< this.requiredStatistics.avgRunTime = true this.requiredStatistics.medRunTime = opts.medRunTime as boolean } - if ( - opts.weights != null && - Object.keys(opts.weights).length < this.pool.size - ) { - throw new Error( - 'Worker choice strategy options must have a weight for each worker node.' - ) - } } /** @inheritDoc */ @@ -77,7 +69,7 @@ export abstract class AbstractWorkerChoiceStrategy< /** @inheritDoc */ public setOptions (opts: WorkerChoiceStrategyOptions): void { opts = opts ?? DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS - this.checkOptions(opts) + this.setRequiredStatistics(opts) this.opts = opts } @@ -124,9 +116,13 @@ export abstract class AbstractWorkerChoiceStrategy< // return this.workerNodes.findLastIndex(workerNode => { // return workerNode.tasksUsage.running === 0 // }) - for (let i = this.pool.workerNodes.length - 1; i >= 0; i--) { - if (this.pool.workerNodes[i].tasksUsage.running === 0) { - return i + for ( + let workerNodeKey = this.pool.workerNodes.length - 1; + workerNodeKey >= 0; + workerNodeKey-- + ) { + if (this.pool.workerNodes[workerNodeKey].tasksUsage.running === 0) { + return workerNodeKey } } return -1