-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 type { IWorker } from '../worker.js'
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy.js'
import type {
IWorkerChoiceStrategy,
average: true,
median: false
},
- waitTime: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS,
+ waitTime: {
+ aggregate: true,
+ average: true,
+ median: false
+ },
elu: DEFAULT_MEASUREMENT_STATISTICS_REQUIREMENTS
}
*/
private workerNodeId = 0
/**
- * Worker node virtual task runtime.
+ * Worker node virtual execution time.
*/
- private workerNodeVirtualTaskRunTime = 0
+ private workerNodeVirtualTaskExecutionTime = 0
/** @inheritDoc */
public constructor (
this.resetWorkerNodeKeyProperties()
this.roundId = 0
this.workerNodeId = 0
- this.workerNodeVirtualTaskRunTime = 0
+ this.workerNodeVirtualTaskExecutionTime = 0
return true
}
this.workerNodeId = workerNodeKey
if (
this.workerNodeId !== this.nextWorkerNodeKey &&
- this.workerNodeVirtualTaskRunTime !== 0
+ this.workerNodeVirtualTaskExecutionTime !== 0
) {
- this.workerNodeVirtualTaskRunTime = 0
+ this.workerNodeVirtualTaskExecutionTime = 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] &&
- this.workerNodeVirtualTaskRunTime < workerWeight
+ this.workerNodeVirtualTaskExecutionTime < workerWeight
) {
- this.workerNodeVirtualTaskRunTime =
- this.workerNodeVirtualTaskRunTime +
+ this.workerNodeVirtualTaskExecutionTime +=
+ this.getWorkerNodeTaskWaitTime(workerNodeKey) +
this.getWorkerNodeTaskRunTime(workerNodeKey)
this.setPreviousWorkerNodeKey(this.nextWorkerNodeKey)
this.nextWorkerNodeKey = workerNodeKey
}
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
) {
/** @inheritDoc */
public remove (workerNodeKey: number): boolean {
if (this.pool.workerNodes.length === 0) {
- this.reset()
+ this.resetWorkerNodeKeyProperties()
+ this.workerNodeId = 0
+ this.workerNodeVirtualTaskExecutionTime = 0
+ return true
}
if (
this.workerNodeId === workerNodeKey &&