repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build(deps-dev): bump @types/node
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
interleaved-weighted-round-robin-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
b/src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
index fe4b48833ee98459880878c91a82204cac8408f5..6bbcc5f5b965e1fa3c0d05b018437b4f2e796708 100644
(file)
--- a/
src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/interleaved-weighted-round-robin-worker-choice-strategy.ts
@@
-1,11
+1,11
@@
import type { IWorker } from '../worker.js'
import type { IPool } from '../pool.js'
import type { IWorker } from '../worker.js'
import type { IPool } from '../pool.js'
-import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../
../
utils.js'
+import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../utils.js'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js'
import type {
IWorkerChoiceStrategy,
-
InternalWorkerChoiceStrategyOption
s,
-
TaskStatisticsRequirement
s
+
TaskStatisticsRequirement
s,
+
WorkerChoiceStrategyOption
s
} from './selection-strategies-types.js'
/**
} from './selection-strategies-types.js'
/**
@@
-36,7
+36,7
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
/**
* Round id.
*/
/**
* Round id.
*/
- private roundId
: number
= 0
+ private roundId = 0
/**
* Round weights.
*/
/**
* Round weights.
*/
@@
-44,16
+44,16
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
/**
* Worker node id.
*/
/**
* Worker node id.
*/
- private workerNodeId
: number
= 0
+ private workerNodeId = 0
/**
* Worker node virtual task runtime.
*/
/**
* Worker node virtual task runtime.
*/
- private workerNodeVirtualTaskRunTime
: number
= 0
+ private workerNodeVirtualTaskRunTime = 0
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
- opts
: Internal
WorkerChoiceStrategyOptions
+ opts
?:
WorkerChoiceStrategyOptions
) {
super(pool, opts)
this.setTaskStatisticsRequirements(this.opts)
) {
super(pool, opts)
this.setTaskStatisticsRequirements(this.opts)
@@
-95,7
+95,7
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
this.workerNodeVirtualTaskRunTime = 0
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.workerNodeVirtualTaskRunTime = 0
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- const workerWeight = this.opts
.weights![workerNodeKey]!
+ const workerWeight = this.opts
!.weights![workerNodeKey]
if (
this.isWorkerNodeReady(workerNodeKey) &&
workerWeight >= this.roundWeights[roundIndex] &&
if (
this.isWorkerNodeReady(workerNodeKey) &&
workerWeight >= this.roundWeights[roundIndex] &&
@@
-114,7
+114,9
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
}
private interleavedWeightedRoundRobinNextWorkerNodeId (): void {
}
private interleavedWeightedRoundRobinNextWorkerNodeId (): void {
- if (
+ if (this.pool.workerNodes.length === 0) {
+ this.workerNodeId = 0
+ } else if (
this.roundId === this.roundWeights.length - 1 &&
this.workerNodeId === this.pool.workerNodes.length - 1
) {
this.roundId === this.roundWeights.length - 1 &&
this.workerNodeId === this.pool.workerNodes.length - 1
) {
@@
-131,7
+133,10
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
if (this.pool.workerNodes.length === 0) {
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
if (this.pool.workerNodes.length === 0) {
- this.reset()
+ this.resetWorkerNodeKeyProperties()
+ this.workerNodeId = 0
+ this.workerNodeVirtualTaskRunTime = 0
+ return true
}
if (
this.workerNodeId === workerNodeKey &&
}
if (
this.workerNodeId === workerNodeKey &&
@@
-149,7
+154,7
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public setOptions (opts:
InternalWorkerChoiceStrategyOptions
): void {
+ public setOptions (opts:
WorkerChoiceStrategyOptions | undefined
): void {
super.setOptions(opts)
this.roundWeights = this.getRoundWeights()
}
super.setOptions(opts)
this.roundWeights = this.getRoundWeights()
}
@@
-158,7
+163,7
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
return [
...new Set(
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
return [
...new Set(
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
- Object.values(this.opts.weights!)
+ Object.values(this.opts
!
.weights!)
.slice()
.sort((a, b) => a - b)
)
.slice()
.sort((a, b) => a - b)
)