Merge e0335b8 into 1865629

kubernetes-retired · Aug 21, 2017 · 86b15f0 · 86b15f0
2 parents 1865629 + e0335b8
commit 86b15f0
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 57 deletions.
diff --git a/pkg/stats/poseidonstats.pb.go b/pkg/stats/poseidonstats.pb.go
diff --git a/pkg/stats/poseidonstats.proto b/pkg/stats/poseidonstats.proto
@@ -40,6 +40,8 @@ message NodeStats {
   // Memory stats (fraction of total).
   double mem_reservation = 9;
   double mem_utilization = 10;
+  // per core utilization
+  repeated int64 cpu_core_utilization = 11;
 }
 
 enum NodeStatsResponseType {
@@ -91,4 +93,4 @@ message PodStatsResponse {
   PodStatsResponseType type = 1;
   string name = 2;
   string namespace = 3;
-}
+}
diff --git a/pkg/stats/stats.go b/pkg/stats/stats.go
@@ -60,15 +60,19 @@ func convertPodStatsToTaskStats(podStats *PodStats) *firmament.TaskStats {
 }
 
 func convertNodeStatsToResourceStats(nodeStats *NodeStats) *firmament.ResourceStats {
-	cpuStats := &firmament.CpuStats{
-		CpuAllocatable: nodeStats.GetCpuAllocatable(),
-		CpuCapacity:    nodeStats.GetCpuCapacity(),
-		CpuReservation: nodeStats.GetCpuReservation(),
-		CpuUtilization: nodeStats.GetCpuUtilization(),
+	percoreUtilization := nodeStats.GetCpuCoreUtilization()
+	var cpuStats []*firmament.CpuStats
+	for index, _ := range percoreUtilization {
+		cpuStats = append(cpuStats, &firmament.CpuStats{
+			CpuAllocatable: nodeStats.GetCpuAllocatable(),
+			CpuCapacity:    nodeStats.GetCpuCapacity(),
+			CpuReservation: nodeStats.GetCpuReservation(),
+			CpuUtilization: float64(percoreUtilization[index]),
+		})
 	}
 	return &firmament.ResourceStats{
 		Timestamp:      nodeStats.GetTimestamp(),
-		CpusStats:      []*firmament.CpuStats{cpuStats},
+		CpusStats:      cpuStats,
 		MemAllocatable: nodeStats.GetMemAllocatable(),
 		MemCapacity:    nodeStats.GetMemCapacity(),
 		MemReservation: nodeStats.GetMemReservation(),