Skip to content

Commit

Permalink
Prevent nomad alloc status output inconsistency
Browse files Browse the repository at this point in the history
Prevent random map ordering and sort alphabetically
  • Loading branch information
drewbailey committed Nov 1, 2019
1 parent 20bb9f0 commit fb7bd8c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions command/alloc_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ func TestAllocStatusCommand_ScoreMetrics(t *testing.T) {
require.Contains(out, "Placement Metrics")
require.Contains(out, mockNode1.ID)
require.Contains(out, mockNode2.ID)

// assert we sort headers alphabetically
require.Contains(out, "binpack node-affinity")
require.Contains(out, "final score")
}

Expand Down
12 changes: 11 additions & 1 deletion command/monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package command

import (
"fmt"
"sort"
"strings"
"sync"
"time"
Expand Down Expand Up @@ -380,7 +381,16 @@ func formatAllocMetrics(metrics *api.AllocationMetric, scores bool, prefix strin
// Add header as first row
if i == 0 {
scoreOutput[0] = "Node|"
for scorerName := range scoreMeta.Scores {

// sort scores alphabetically
scores := make([]string, 0, len(scoreMeta.Scores))
for k := range scoreMeta.Scores {
scores = append(scores, k)
}
sort.Strings(scores)

// build score header output
for _, scorerName := range scores {
scoreOutput[0] += fmt.Sprintf("%v|", scorerName)
scorerNames = append(scorerNames, scorerName)
}
Expand Down

0 comments on commit fb7bd8c

Please sign in to comment.