repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into combine-prs-branch
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
round-robin-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
b/src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
index b023234a202cacc50b8f2505859e4e444bcf8f0f..7356a0bc2f4b376ef53eb205529cddeddbd0f434 100644
(file)
--- a/
src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/round-robin-worker-choice-strategy.ts
@@
-4,7
+4,6
@@
import type { IWorker } from '../worker'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
- StrategyPolicy,
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
@@
-22,11
+21,6
@@
export class RoundRobinWorkerChoiceStrategy<
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
- /** @inheritDoc */
- public readonly strategyPolicy: StrategyPolicy = {
- useDynamicWorker: true
- }
-
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
@@
-38,7
+32,7
@@
export class RoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public reset (): boolean {
/** @inheritDoc */
public reset (): boolean {
- this.
nextWorkerNodeKey = 0
+ this.
resetWorkerNodeKeyProperties()
return true
}
return true
}
@@
-48,11
+42,10
@@
export class RoundRobinWorkerChoiceStrategy<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public choose (): number {
+ public choose (): number
| undefined
{
const chosenWorkerNodeKey = this.nextWorkerNodeKey
const chosenWorkerNodeKey = this.nextWorkerNodeKey
- do {
- this.roundRobinNextWorkerNodeKey()
- } while (!this.isWorkerNodeReady(this.nextWorkerNodeKey))
+ this.roundRobinNextWorkerNodeKey()
+ this.checkNextWorkerNodeEligibility(chosenWorkerNodeKey)
return chosenWorkerNodeKey
}
return chosenWorkerNodeKey
}
@@
-68,11
+61,11
@@
export class RoundRobinWorkerChoiceStrategy<
return true
}
return true
}
- private roundRobinNextWorkerNodeKey (): number {
+ private roundRobinNextWorkerNodeKey (): number
| undefined
{
this.nextWorkerNodeKey =
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
this.nextWorkerNodeKey =
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
- :
this.nextWorkerNodeKey
+ 1
+ :
(this.nextWorkerNodeKey ?? this.previousWorkerNodeKey)
+ 1
return this.nextWorkerNodeKey
}
}
return this.nextWorkerNodeKey
}
}