repositories
/
poolifier.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:poolifier/poolifier
[poolifier.git]
/
src
/
pools
/
selection-strategies
/
fair-share-worker-choice-strategy.ts
diff --git
a/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
b/src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
index bf30a4764d4ffdd5287fcbbad588baddca42b193..cfda1b0b92b500c86fa0f61cdb49cb0f90c10370 100644
(file)
--- a/
src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
+++ b/
src/pools/selection-strategies/fair-share-worker-choice-strategy.ts
@@
-8,6
+8,7
@@
import { AbstractWorkerChoiceStrategy } from './abstract-worker-choice-strategy'
import {
type IWorkerChoiceStrategy,
Measurements,
import {
type IWorkerChoiceStrategy,
Measurements,
+ type StrategyPolicy,
type TaskStatisticsRequirements,
type WorkerChoiceStrategyOptions
} from './selection-strategies-types'
type TaskStatisticsRequirements,
type WorkerChoiceStrategyOptions
} from './selection-strategies-types'
@@
-27,6
+28,12
@@
export class FairShareWorkerChoiceStrategy<
>
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: {
@@
-69,8
+76,10
@@
export class FairShareWorkerChoiceStrategy<
}
/** @inheritDoc */
}
/** @inheritDoc */
- public choose (): number {
- return this.fairShareNextWorkerNodeKey()
+ public choose (): number | undefined {
+ const chosenWorkerNodeKey = this.fairShareNextWorkerNodeKey()
+ this.assignChosenWorkerNodeKey(chosenWorkerNodeKey)
+ return this.nextWorkerNodeKey
}
/** @inheritDoc */
}
/** @inheritDoc */
@@
-79,8
+88,9
@@
export class FairShareWorkerChoiceStrategy<
return true
}
return true
}
- private fairShareNextWorkerNodeKey (): number {
+ private fairShareNextWorkerNodeKey (): number
| undefined
{
let minWorkerVirtualTaskEndTimestamp = Infinity
let minWorkerVirtualTaskEndTimestamp = Infinity
+ let chosenWorkerNodeKey: number | undefined
for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
for (const [workerNodeKey] of this.pool.workerNodes.entries()) {
if (this.workersVirtualTaskEndTimestamp[workerNodeKey] == null) {
this.computeWorkerVirtualTaskEndTimestamp(workerNodeKey)
@@
-88,14
+98,14
@@
export class FairShareWorkerChoiceStrategy<
const workerVirtualTaskEndTimestamp =
this.workersVirtualTaskEndTimestamp[workerNodeKey]
if (
const workerVirtualTaskEndTimestamp =
this.workersVirtualTaskEndTimestamp[workerNodeKey]
if (
- this.isWorkerNode
Ready
(workerNodeKey) &&
+ this.isWorkerNode
Eligible
(workerNodeKey) &&
workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp
) {
minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
workerVirtualTaskEndTimestamp < minWorkerVirtualTaskEndTimestamp
) {
minWorkerVirtualTaskEndTimestamp = workerVirtualTaskEndTimestamp
-
this.next
WorkerNodeKey = workerNodeKey
+
chosen
WorkerNodeKey = workerNodeKey
}
}
}
}
- return
this.next
WorkerNodeKey
+ return
chosen
WorkerNodeKey
}
/**
}
/**