X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=inline;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=f9ddb3a1c54dd5798c94a30fb3ae58437932fe42;hb=27a8a097ad47621d1a914240d777921f129cff61;hp=b7e0a4a7d8d80bc98d55a859cc241f1600bfd41f;hpb=8e8d9101768c28914dabc95c14740985e18f1f04;p=poolifier.git diff --git a/src/pools/selection-strategies/worker-choice-strategy-context.ts b/src/pools/selection-strategies/worker-choice-strategy-context.ts index b7e0a4a7..f9ddb3a1 100644 --- a/src/pools/selection-strategies/worker-choice-strategy-context.ts +++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts @@ -1,11 +1,11 @@ import type { IPool } from '../pool.js' +import { getWorkerChoiceStrategyRetries } from '../utils.js' import type { IWorker } from '../worker.js' -import { getWorkerChoiceStrategyRetries } from '../../utils.js' import { FairShareWorkerChoiceStrategy } from './fair-share-worker-choice-strategy.js' import { InterleavedWeightedRoundRobinWorkerChoiceStrategy } from './interleaved-weighted-round-robin-worker-choice-strategy.js' import { LeastBusyWorkerChoiceStrategy } from './least-busy-worker-choice-strategy.js' -import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy.js' import { LeastEluWorkerChoiceStrategy } from './least-elu-worker-choice-strategy.js' +import { LeastUsedWorkerChoiceStrategy } from './least-used-worker-choice-strategy.js' import { RoundRobinWorkerChoiceStrategy } from './round-robin-worker-choice-strategy.js' import type { IWorkerChoiceStrategy, @@ -29,6 +29,11 @@ export class WorkerChoiceStrategyContext< Data = unknown, Response = unknown > { + /** + * The number of worker choice strategy execution retries. + */ + public retriesCount: number + /** * The worker choice strategy instances registered in the context. */ @@ -38,7 +43,7 @@ export class WorkerChoiceStrategyContext< > /** - * The number of worker choice strategy execution retries. + * The maximum number of worker choice strategy execution retries. */ private readonly retries: number @@ -111,6 +116,7 @@ export class WorkerChoiceStrategyContext< >(pool, opts) ] ]) + this.retriesCount = 0 this.retries = getWorkerChoiceStrategyRetries(pool, opts) } @@ -188,13 +194,11 @@ export class WorkerChoiceStrategyContext< let retriesCount = 0 do { workerNodeKey = workerChoiceStrategy.choose() - if (workerNodeKey != null && workerNodeKey < 0) { - workerNodeKey = undefined - } if (workerNodeKey == null && chooseCount > 0) { - retriesCount++ + ++retriesCount + ++this.retriesCount } - chooseCount++ + ++chooseCount } while (workerNodeKey == null && retriesCount < this.retries) if (workerNodeKey == null) { throw new Error(