X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=56d9dc361fe6e70255877ec6c1e6be6f33b70a70;hb=78ebe9d5933520d55ba8d025bb124e8beca01a4c;hp=0ae939949b1c115918db6bb1f33dfab2e253191a;hpb=49be33feded000ed776ee589274e154fa519b263;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 0ae93994..56d9dc36 100644 --- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts @@ -27,7 +27,10 @@ export class FairShareWorkerChoiceStrategy< public readonly requiredStatistics: RequiredStatistics = { runTime: true, avgRunTime: true, - medRunTime: false + medRunTime: false, + waitTime: false, + avgWaitTime: false, + medWaitTime: false } /** @@ -97,10 +100,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 {