X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fpools%2Fselection-strategies%2Fworker-choice-strategy-context.ts;h=fc940a2fbb0f7d85ec450cc35beb60cab75cd141;hb=935f8249773187a56ea8d741e783e8929b5038f1;hp=b7e0a4a7d8d80bc98d55a859cc241f1600bfd41f;hpb=e372f3935374fbbea3a5d3acc72813b36ced86ff;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..fc940a2f 100644 --- a/src/pools/selection-strategies/worker-choice-strategy-context.ts +++ b/src/pools/selection-strategies/worker-choice-strategy-context.ts @@ -1,6 +1,6 @@ import type { IPool } from '../pool.js' import type { IWorker } from '../worker.js' -import { getWorkerChoiceStrategyRetries } from '../../utils.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' @@ -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(