repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: refine pool statuses handling
[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 b034cba1d08d69761b3c8f05fdedf395c4702c0a..b11f0a177aa44925d510b697e48b578fe14169b4 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,14
+1,11
@@
import type { IWorker } from '../worker'
import type { IPool } from '../pool'
import type { IWorker } from '../worker'
import type { IPool } from '../pool'
-import {
- DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
- DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
-} from '../../utils'
+import { DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS } from '../../utils'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import type {
IWorkerChoiceStrategy,
-
TaskStatisticsRequirement
s,
-
WorkerChoiceStrategyOption
s
+
InternalWorkerChoiceStrategyOption
s,
+
TaskStatisticsRequirement
s
} from './selection-strategies-types'
/**
} from './selection-strategies-types'
/**
@@
-40,10
+37,6
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
* Round id.
*/
private roundId: number = 0
* Round id.
*/
private roundId: number = 0
- /**
- * Default worker weight.
- */
- private readonly defaultWorkerWeight: number
/**
* Round weights.
*/
/**
* Round weights.
*/
@@
-60,11
+53,10
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
/** @inheritDoc */
public constructor (
pool: IPool<Worker, Data, Response>,
- opts:
WorkerChoiceStrategyOptions = DEFAULT_WORKER_CHOICE_STRATEGY_OPTIONS
+ opts:
InternalWorkerChoiceStrategyOptions
) {
super(pool, opts)
this.setTaskStatisticsRequirements(this.opts)
) {
super(pool, opts)
this.setTaskStatisticsRequirements(this.opts)
- this.defaultWorkerWeight = this.computeDefaultWorkerWeight()
this.roundWeights = this.getRoundWeights()
}
this.roundWeights = this.getRoundWeights()
}
@@
-102,9
+94,9
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
) {
this.workerNodeVirtualTaskRunTime = 0
}
) {
this.workerNodeVirtualTaskRunTime = 0
}
- const workerWeight =
- this.opts.weights?.[workerNodeKey] ?? this.defaultWorkerWeight
+ const workerWeight = this.opts.weights?.[workerNodeKey] as number
if (
if (
+ this.isWorkerNodeReady(workerNodeKey) &&
workerWeight >= this.roundWeights[roundIndex] &&
this.workerNodeVirtualTaskRunTime < workerWeight
) {
workerWeight >= this.roundWeights[roundIndex] &&
this.workerNodeVirtualTaskRunTime < workerWeight
) {
@@
-156,18
+148,15
@@
export class InterleavedWeightedRoundRobinWorkerChoiceStrategy<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public setOptions (opts: WorkerChoiceStrategyOptions): void {
+ public setOptions (opts:
Internal
WorkerChoiceStrategyOptions): void {
super.setOptions(opts)
this.roundWeights = this.getRoundWeights()
}
private getRoundWeights (): number[] {
super.setOptions(opts)
this.roundWeights = this.getRoundWeights()
}
private getRoundWeights (): number[] {
- if (this.opts.weights == null) {
- return [this.defaultWorkerWeight]
- }
return [
...new Set(
return [
...new Set(
- Object.values(this.opts.weights)
+ Object.values(this.opts.weights
as Record<number, number>
)
.slice()
.sort((a, b) => a - b)
)
.slice()
.sort((a, b) => a - b)
)