repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: avoid out of bound at worker node removal
[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 ed38aa1497176ba88751e83a850e1794b3aaa9fd..c87081a6161c82ab612d5aca2b37a49e6b1089b0 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,11
+26,6
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
>
extends AbstractWorkerChoiceStrategy<Worker, Data, Response>
implements IWorkerChoiceStrategy {
- /** @inheritDoc */
- public readonly strategyPolicy: StrategyPolicy = {
- useDynamicWorker: true
- }
-
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
runTime: {
/** @inheritDoc */
public readonly taskStatisticsRequirements: TaskStatisticsRequirements = {
runTime: {
@@
-64,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
}
@@
-75,39
+69,46
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public choose (): number {
- const chosenWorkerNodeKey = this.nextWorkerNodeKey
- this.weightedRoundRobinNextWorkerNodeKey()
- return chosenWorkerNodeKey
+ public choose (): number | undefined {
+ this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
+ return this.weightedRoundRobinNextWorkerNodeKey()
}
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
}
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
+ if (this.pool.workerNodes.length === 0) {
+ this.reset()
+ }
if (this.nextWorkerNodeKey === workerNodeKey) {
if (this.nextWorkerNodeKey === workerNodeKey) {
- if (this.pool.workerNodes.length === 0) {
- this.nextWorkerNodeKey = 0
- } else if (this.nextWorkerNodeKey > this.pool.workerNodes.length - 1) {
- this.nextWorkerNodeKey = this.pool.workerNodes.length - 1
- }
this.workerVirtualTaskRunTime = 0
}
this.workerVirtualTaskRunTime = 0
}
+ if (
+ this.previousWorkerNodeKey === workerNodeKey &&
+ this.previousWorkerNodeKey > this.pool.workerNodes.length - 1
+ ) {
+ this.previousWorkerNodeKey = this.pool.workerNodes.length - 1
+ }
return true
}
return true
}
- private weightedRoundRobinNextWorkerNodeKey (): void {
- const workerVirtualTaskRunTime = this.workerVirtualTaskRunTime
+ private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
const workerWeight =
const workerWeight =
- this.opts.weights?.[this.nextWorkerNodeKey] ?? this.defaultWorkerWeight
- if (workerVirtualTaskRunTime < workerWeight) {
+ this.opts.weights?.[
+ this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
+ ] ?? this.defaultWorkerWeight
+ if (this.workerVirtualTaskRunTime < workerWeight) {
this.workerVirtualTaskRunTime =
this.workerVirtualTaskRunTime =
- workerVirtualTaskRunTime +
- this.getWorkerTaskRunTime(this.nextWorkerNodeKey)
+ this.workerVirtualTaskRunTime +
+ 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
+ 1
+ :
(this.nextWorkerNodeKey ?? this.previousWorkerNodeKey)
+ 1
this.workerVirtualTaskRunTime = 0
}
this.workerVirtualTaskRunTime = 0
}
+ return this.nextWorkerNodeKey
}
}
}
}