mirror of
https://github.com/kemko/nomad.git
synced 2026-01-09 11:55:42 +03:00
scheduler: add check to prohibit returning inf during spread boost calculation
This commit is contained in:
@@ -194,7 +194,7 @@ func evenSpreadScoreBoost(pset *propertySet, option *structs.Node) float64 {
|
||||
for _, value := range combinedUseMap {
|
||||
if minCount == 0 || value < minCount {
|
||||
minCount = value
|
||||
}
|
||||
|
||||
if maxCount == 0 || value > maxCount {
|
||||
maxCount = value
|
||||
}
|
||||
@@ -214,7 +214,11 @@ func evenSpreadScoreBoost(pset *propertySet, option *structs.Node) float64 {
|
||||
} else if minCount == maxCount {
|
||||
// Maximum possible penalty when the distribution is even
|
||||
return -1.0
|
||||
} else if minCount == 0 {
|
||||
// Maximum possible boost
|
||||
return 1.0
|
||||
}
|
||||
|
||||
// Penalty based on delta from max value
|
||||
delta := int(maxCount - minCount)
|
||||
deltaBoost = float64(delta) / float64(minCount)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package scheduler
|
||||
|
||||
import (
|
||||
"math"
|
||||
"testing"
|
||||
|
||||
"fmt"
|
||||
@@ -311,6 +312,7 @@ func TestSpreadIterator_EvenSpread(t *testing.T) {
|
||||
}
|
||||
for _, rn := range out {
|
||||
require.Equal(t, fmt.Sprintf("%.3f", expectedScores[rn.Node.Datacenter]), fmt.Sprintf("%.3f", rn.FinalScore))
|
||||
|
||||
}
|
||||
|
||||
// Update the plan to add allocs to nodes in dc1
|
||||
@@ -543,3 +545,25 @@ func TestSpreadIterator_MaxPenalty(t *testing.T) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func Test_evenSpreadScoreBoost(t *testing.T) {
|
||||
pset := &propertySet{
|
||||
existingValues: map[string]uint64{},
|
||||
proposedValues: map[string]uint64{
|
||||
"dc2": 1,
|
||||
"dc1": 1,
|
||||
"dc3": 1,
|
||||
},
|
||||
clearedValues: map[string]uint64{
|
||||
"dc2": 1,
|
||||
"dc3": 1,
|
||||
},
|
||||
targetAttribute: "${node.datacenter}",
|
||||
}
|
||||
|
||||
opt := &structs.Node{
|
||||
Datacenter: "dc2",
|
||||
}
|
||||
boost := evenSpreadScoreBoost(pset, opt)
|
||||
require.False(t, math.IsInf(boost, 1))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user