repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: code cleanup
[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 701e51656366369abadb22edcadca5c3e03c90fe..5148494ed93f478862504515175708ecdd633f04 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: {
@@
-49,9
+42,9
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
*/
private readonly defaultWorkerWeight: number
/**
*/
private readonly defaultWorkerWeight: number
/**
- * Worker virtual task runtime.
+ * Worker
node
virtual task runtime.
*/
*/
- private workerVirtualTaskRunTime: number = 0
+ private worker
Node
VirtualTaskRunTime: number = 0
/** @inheritDoc */
public constructor (
/** @inheritDoc */
public constructor (
@@
-65,8
+58,8
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public reset (): boolean {
/** @inheritDoc */
public reset (): boolean {
- this.
nextWorkerNodeKey = 0
- this.workerVirtualTaskRunTime = 0
+ this.
resetWorkerNodeKeyProperties()
+ this.worker
Node
VirtualTaskRunTime = 0
return true
}
return true
}
@@
-77,39
+70,41
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public choose (): number | undefined {
/** @inheritDoc */
public choose (): number | undefined {
- const chosenWorkerNodeKey = this.nextWorkerNodeKey
+ this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
this.weightedRoundRobinNextWorkerNodeKey()
this.weightedRoundRobinNextWorkerNodeKey()
- if (!this.isWorkerNodeEligible(this.nextWorkerNodeKey as number)) {
- this.nextWorkerNodeKey = undefined
- this.previousWorkerNodeKey =
- chosenWorkerNodeKey ?? this.previousWorkerNodeKey
- }
- return chosenWorkerNodeKey
+ this.checkNextWorkerNodeReadiness()
+ return this.nextWorkerNodeKey
}
/** @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.workerNodeVirtualTaskRunTime = 0
+ if (this.nextWorkerNodeKey > this.pool.workerNodes.length - 1) {
this.nextWorkerNodeKey = this.pool.workerNodes.length - 1
}
this.nextWorkerNodeKey = this.pool.workerNodes.length - 1
}
- 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 (
worker
VirtualTaskRunTime < workerWeight) {
- this.workerVirtualTaskRunTime =
-
worker
VirtualTaskRunTime +
- this.getWorkerTaskRunTime(
+ if (
this.workerNode
VirtualTaskRunTime < workerWeight) {
+ this.worker
Node
VirtualTaskRunTime =
+
this.workerNode
VirtualTaskRunTime +
+ this.getWorker
Node
TaskRunTime(
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
)
} else {
this.nextWorkerNodeKey ?? this.previousWorkerNodeKey
)
} else {
@@
-117,7
+112,7
@@
export class WeightedRoundRobinWorkerChoiceStrategy<
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
: (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
this.nextWorkerNodeKey === this.pool.workerNodes.length - 1
? 0
: (this.nextWorkerNodeKey ?? this.previousWorkerNodeKey) + 1
- this.workerVirtualTaskRunTime = 0
+ this.worker
Node
VirtualTaskRunTime = 0
}
return this.nextWorkerNodeKey
}
}
return this.nextWorkerNodeKey
}