X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fweighted-round-robin-worker-choice-strategy.ts;h=f04847782f540e9edea4603b47afe4c70aa4e299;hb=75f30e744551af87736f998db9ad02be7206e89e;hp=6bbbbaf64738527cafb2720ae9a5ba73d7544c0e;hpb=39618ede0e08d380c1ac82005bcc2ab1f3c227b6;p=poolifier.git diff --git a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts index 6bbbbaf6..f0484778 100644 --- a/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts +++ b/src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts @@ -1,6 +1,6 @@ -import type { IWorker } from '../worker.js' import type { IPool } from '../pool.js' -import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils.js' +import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js' +import type { IWorker } from '../worker.js' import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, @@ -37,7 +37,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< /** * Worker node virtual task runtime. */ - private workerNodeVirtualTaskRunTime: number = 0 + private workerNodeVirtualTaskRunTime = 0 /** @inheritDoc */ public constructor ( @@ -64,7 +64,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< public choose (): number | undefined { this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey) this.weightedRoundRobinNextWorkerNodeKey() - this.checkNextWorkerNodeReadiness() + this.checkNextWorkerNodeKey() return this.nextWorkerNodeKey } @@ -72,6 +72,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< public remove (workerNodeKey: number): boolean { if (this.pool.workerNodes.length === 0) { this.reset() + return true } if (this.nextWorkerNodeKey === workerNodeKey) { this.workerNodeVirtualTaskRunTime = 0 @@ -91,7 +92,7 @@ export class WeightedRoundRobinWorkerChoiceStrategy< private weightedRoundRobinNextWorkerNodeKey (): number | undefined { const workerWeight = // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - this.opts!.weights![this.nextWorkerNodeKey ?? this.previousWorkerNodeKey]! + this.opts!.weights![this.nextWorkerNodeKey ?? this.previousWorkerNodeKey] if (this.workerNodeVirtualTaskRunTime < workerWeight) { this.workerNodeVirtualTaskRunTime = this.workerNodeVirtualTaskRunTime +