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' of github.com:poolifier/poolifier
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
weighted-round-robin-worker-choice-strategy.ts
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 1aab3d1c6fdfd82ace0147aa27a6ce67be7b2cf8..46575b80d851ec719b783a370d20194b8ba72d58 100644
(file)
--- a/
src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/weighted-round-robin-worker-choice-strategy.ts
@@
-7,7
+7,6
@@
import {
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
- StrategyPolicy,
TaskStatisticsRequirements,
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
TaskStatisticsRequirements,
WorkerChoiceStrategyOptions
} from './selection-strategies-types'
@@
-27,12
+26,6
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
- /** @inheritDoc */
- public readonly strategyPolicy: StrategyPolicy = {
- dynamicWorkerUsage: false,
- dynamicWorkerReady: true
- }
-
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
runTime: {
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
runTime: {
@@
-65,7
+58,7
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public reset (): boolean {
/** @inheritDoc */
public reset (): boolean {
- this.
nextWorkerNodeKey = 0
+ this.
resetWorkerNodeKeyProperties()
this.workerVirtualTaskRunTime = 0
return true
}
this.workerVirtualTaskRunTime = 0
return true
}
@@
-79,9
+72,7
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
public choose (): number | undefined {
const chosenWorkerNodeKey = this.nextWorkerNodeKey
this.weightedRoundRobinNextWorkerNodeKey()
public choose (): number | undefined {
const chosenWorkerNodeKey = this.nextWorkerNodeKey
this.weightedRoundRobinNextWorkerNodeKey()
- if (!this.isWorkerNodeEligible(this.nextWorkerNodeKey as number)) {
- this.nextWorkerNodeKey = undefined
- }
+ this.checkNextWorkerNodeEligibility(chosenWorkerNodeKey)
return chosenWorkerNodeKey
}
return chosenWorkerNodeKey
}
@@
-101,17
+92,20
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
const workerVirtualTaskRunTime = this.workerVirtualTaskRunTime
const workerWeight =
private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
const workerVirtualTaskRunTime = this.workerVirtualTaskRunTime
const workerWeight =
- this.opts.weights?.[this.nextWorkerNodeKey ?? 0] ??
- this.defaultWorkerWeight
+ this.opts.weights?.[
+ this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+ ] ?? this.defaultWorkerWeight
if (workerVirtualTaskRunTime < workerWeight) {
this.workerVirtualTaskRunTime =
workerVirtualTaskRunTime +
if (workerVirtualTaskRunTime < workerWeight) {
this.workerVirtualTaskRunTime =
workerVirtualTaskRunTime +
- this.getWorkerTaskRunTime(this.nextWorkerNodeKey ?? 0)
+ this.getWorkerTaskRunTime(
+ this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+ )
} else {
this.nextWorkerNodeKey =
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
} else {
this.nextWorkerNodeKey =
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
- : (this.nextWorkerNodeKey ??
0
) + 1
+ : (this.nextWorkerNodeKey ??
this.previousWorkerNodeKey
) + 1
this.workerVirtualTaskRunTime = 0
}
return this.nextWorkerNodeKey
this.workerVirtualTaskRunTime = 0
}
return this.nextWorkerNodeKey