Add node_pool to blockedEval metric

Adds the node_pool to the blockedEval metrics that get emitted for
resource/cpu, along with the dc and node class.

Author: allisonlarson

api/allocations.go

@@ -307,6 +307,7 @@ type AllocationMetric struct {
 	NodesEvaluated     int
 	NodesFiltered      int
 	NodesInPool        int
+	NodePool           string
 	NodesAvailable     map[string]int
 	ClassFiltered      map[string]int
 	ConstraintFiltered map[string]int

nomad/blocked_evals.go

@@ -749,6 +749,7 @@ func (b *BlockedEvals) EmitStats(period time.Duration, stopCh <-chan struct{}) {
 				labels := []metrics.Label{
 					{Name: "datacenter", Value: k.dc},
 					{Name: "node_class", Value: k.class},
+					{Name: "node_pool", Value: k.nodepool},
 				}
 				metrics.SetGaugeWithLabels([]string{"nomad", "blocked_evals", "cpu"}, float32(v.CPU), labels)
 				metrics.SetGaugeWithLabels([]string{"nomad", "blocked_evals", "memory"}, float32(v.MemoryMB), labels)

nomad/blocked_evals_stats.go

@@ -29,8 +29,9 @@ type BlockedStats struct {
 
 // classInDC is a coordinate of a specific class in a specific datacenter
 type classInDC struct {
-	dc    string
-	class string
+	dc       string
+	class    string
+	nodepool string
 }
 
 // NewBlockedStats returns a new BlockedStats.
@@ -80,6 +81,7 @@ func (b *BlockedStats) prune(cutoff time.Time) {
 func generateResourceStats(eval *structs.Evaluation) *BlockedResourcesStats {
 	dcs := make(map[string]struct{})
 	classes := make(map[string]struct{})
+	nodepools := make(map[string]struct{})
 
 	resources := BlockedResourcesSummary{
 		Timestamp: time.Now().UTC(),
@@ -92,6 +94,9 @@ func generateResourceStats(eval *structs.Evaluation) *BlockedResourcesStats {
 		for class := range allocMetrics.ClassExhausted {
 			classes[class] = struct{}{}
 		}
+
+		nodepools[allocMetrics.NodePool] = struct{}{}
+
 		if len(allocMetrics.ClassExhausted) == 0 {
 			// some evaluations have no class
 			classes[""] = struct{}{}
@@ -107,10 +112,12 @@ func generateResourceStats(eval *structs.Evaluation) *BlockedResourcesStats {
 	byJob[nsID] = resources
 
 	byClassInDC := make(map[classInDC]BlockedResourcesSummary)
-	for dc := range dcs {
-		for class := range classes {
-			k := classInDC{dc: dc, class: class}
-			byClassInDC[k] = resources
+	for nodepool := range nodepools {
+		for dc := range dcs {
+			for class := range classes {
+				k := classInDC{dc: dc, class: class, nodepool: nodepool}
+				byClassInDC[k] = resources
+			}
 		}
 	}
 

nomad/blocked_evals_stats_test.go

@@ -147,13 +147,15 @@ var (
 	}
 
 	node1 = classInDC{
-		dc:    "dc1",
-		class: "alpha",
+		dc:       "dc1",
+		class:    "alpha",
+		nodepool: "default",
 	}
 
 	node2 = classInDC{
-		dc:    "dc1",
-		class: "beta",
+		dc:       "dc1",
+		class:    "beta",
+		nodepool: "dev",
 	}
 
 	node3 = classInDC{
@@ -321,6 +323,7 @@ func (t testBlockedEvalsRandomBlockedEval) Generate(rand *rand.Rand, _ int) refl
 	tgCount := rand.Intn(10) + 1
 	dcCount := rand.Intn(3) + 1
 	nodeClassCount := rand.Intn(3) + 1
+	nodePoolName := fmt.Sprintf("node-pool-%d", rand.Intn(3)+1)
 
 	failedTGAllocs := map[string]*structs.AllocMetric{}
 
@@ -340,6 +343,7 @@ func (t testBlockedEvalsRandomBlockedEval) Generate(rand *rand.Rand, _ int) refl
 			},
 			NodesAvailable: map[string]int{},
 			ClassExhausted: map[string]int{},
+			NodePool:       nodePoolName,
 		}
 
 		for dc := 1; dc <= dcCount; dc++ {

nomad/structs/structs.go

@@ -11876,6 +11876,9 @@ type AllocMetric struct {
 	// NodesInPool is the number of nodes in the node pool used by the job.
 	NodesInPool int
 
+	// NodePool is the node pool the node belongs to.
+	NodePool string
+
 	// NodesAvailable is the number of nodes available for evaluation per DC.
 	NodesAvailable map[string]int
 

scheduler/generic_sched.go

@@ -577,6 +577,7 @@ func (s *GenericScheduler) computePlacements(
 			// Store the available nodes by datacenter
 			s.ctx.Metrics().NodesAvailable = byDC
 			s.ctx.Metrics().NodesInPool = len(nodes)
+			s.ctx.Metrics().NodePool = s.job.NodePool
 
 			// Compute top K scoring node metadata
 			s.ctx.Metrics().PopulateScoreMetaData()