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 2c03271e329ea0981c3b898e96245aea3ff63669..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
@@
-58,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
}
@@
-70,34
+70,35
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number | undefined {
/** @inheritDoc */
public choose (): number | undefined {
- const chosenWorkerNodeKey = this.nextWorkerNodeKey
- this.weightedRoundRobinNextWorkerNodeKey()
- this.checkNextWorkerNodeEligibility(chosenWorkerNodeKey)
- return chosenWorkerNodeKey
+ 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
}
private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
return true
}
private weightedRoundRobinNextWorkerNodeKey (): number | undefined {
- const workerVirtualTaskRunTime = this.workerVirtualTaskRunTime
const workerWeight =
this.opts.weights?.[
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
] ?? this.defaultWorkerWeight
const workerWeight =
this.opts.weights?.[
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
] ?? this.defaultWorkerWeight
- if (workerVirtualTaskRunTime < workerWeight) {
+ if (
this.
workerVirtualTaskRunTime < workerWeight) {
this.workerVirtualTaskRunTime =
this.workerVirtualTaskRunTime =
- workerVirtualTaskRunTime +
+
this.
workerVirtualTaskRunTime +
this.getWorkerTaskRunTime(
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
)
this.getWorkerTaskRunTime(
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
)