X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=e26f6b8f5953dff0b3d6dc1d59469977ab264494;hb=f6b641d651fdd5114bcd63bf1c991955d5b7d3eb;hp=3a2e71eea4fcbc3af3c0f35162639747cda171a7;hpb=b0d6ed8f66e9636805462c83e4c9290dccebb690;p=poolifier.git diff --git a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts index 3a2e71ee..e26f6b8f 100644 --- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts @@ -41,7 +41,7 @@ export class FairShareWorkerChoiceStrategy< opts: WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS ) { super(pool, opts) - this.checkOptions(this.opts) + this.setRequiredStatistics(this.opts) } /** @inheritDoc */ @@ -97,10 +97,9 @@ export class FairShareWorkerChoiceStrategy< workerNodeKey: number, workerVirtualTaskStartTimestamp: number ): number { - const workerVirtualTaskRunTime = this.requiredStatistics.medRunTime - ? this.pool.workerNodes[workerNodeKey].tasksUsage.medRunTime - : this.pool.workerNodes[workerNodeKey].tasksUsage.avgRunTime - return workerVirtualTaskStartTimestamp + workerVirtualTaskRunTime + return ( + workerVirtualTaskStartTimestamp + this.getWorkerTaskRunTime(workerNodeKey) + ) } private getWorkerVirtualTaskStartTimestamp (workerNodeKey: number): number {