X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Ffair-share-worker-choice-strategy.ts;h=bf30a4764d4ffdd5287fcbbad588baddca42b193;hb=a038b5175071af7c51dae9e25c7423c7572f3949;hp=351f3d91e10c1a05a60382b63af16de5d5a70d43;hpb=19dbc45b0e2975f938aaae8274902ebe82c48cad;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 351f3d91..bf30a476 100644 --- a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts @@ -70,6 +70,16 @@ export class FairShareWorkerChoiceStrategy< /** @inheritDoc */ public choose (): number { + return this.fairShareNextWorkerNodeKey() + } + + /** @inheritDoc */ + public remove (workerNodeKey: number): boolean { + this.workersVirtualTaskEndTimestamp.splice(workerNodeKey, 1) + return true + } + + private fairShareNextWorkerNodeKey (): number { let minWorkerVirtualTaskEndTimestamp = Infinity for (const [workerNodeKey] of this.pool.workerNodes.entries()) { if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) { @@ -78,20 +88,14 @@ export class FairShareWorkerChoiceStrategy< const workerVirtualTaskEndTimestamp = this.workersVirtualTaskEndTimestamp[workerNodeKey] if ( - this.workerNodeReady(workerNodeKey) && + this.isWorkerNodeReady(workerNodeKey) && workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp ) { minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp - this.nextWorkerNodeId = workerNodeKey + this.nextWorkerNodeKey = workerNodeKey } } - return this.nextWorkerNodeId - } - - /** @inheritDoc */ - public remove (workerNodeKey: number): boolean { - this.workersVirtualTaskEndTimestamp.splice(workerNodeKey, 1) - return true + return this.nextWorkerNodeKey } /**