Merge pull request #826 from cheney-lin/dev/fix_no_pods

fix(sysadvisor): report zero resource when podList is nil

Author: xu282934741

pkg/agent/sysadvisor/plugin/qosaware/reporter/nodemetric_reporter.go

@@ -364,10 +364,7 @@ func (p *nodeMetricsReporterPlugin) getGroupMetricInfo() ([]nodeapis.GroupMetric
 
 	for _, qosLevel := range qosLevels {
 		metricInfo := *newGroupMetricInfo(qosLevel)
-		pods, ok := qosLevel2Pods[qosLevel]
-		if !ok || len(pods) == 0 {
-			continue
-		}
+		pods := qosLevel2Pods[qosLevel]
 		groupUsage, groupNUMAUsages, effectivePods, err := p.getGroupUsage(pods, qosLevel)
 		if err != nil {
 			errList = append(errList, err)
@@ -545,7 +542,10 @@ func (p *nodeMetricsReporterPlugin) getGroupUsage(pods []*v1.Pod, qosLevel strin
 	for numaID := 0; numaID < p.metaServer.NumNUMANodes; numaID++ {
 		resourceUsages, ok := numaUsages[numaID]
 		if !ok {
-			continue
+			resourceUsages = map[v1.ResourceName]resource.Quantity{
+				v1.ResourceCPU:    *resource.NewQuantity(0, resource.DecimalSI),
+				v1.ResourceMemory: *resource.NewQuantity(0, resource.BinarySI),
+			}
 		}
 		resourceNUMAMetric := nodeapis.ResourceMetric{}
 

pkg/agent/sysadvisor/plugin/qosaware/reporter/nodemetric_reporter_test.go

@@ -333,7 +333,22 @@ func TestNodeMetricUpdate(t *testing.T) {
 					{
 						QoSLevel: apiconsts.PodAnnotationQoSLevelDedicatedCores,
 						ResourceUsage: nodeapis.ResourceUsage{
-							NUMAUsage: nil,
+							NUMAUsage: []nodeapis.NUMAMetricInfo{
+								{
+									NUMAId: 0,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+								{
+									NUMAId: 1,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+							},
 							GenericUsage: &nodeapis.ResourceMetric{
 								CPU:    mustParse("1"),
 								Memory: mustParse("10Gi"),
@@ -370,14 +385,55 @@ func TestNodeMetricUpdate(t *testing.T) {
 					{
 						QoSLevel: apiconsts.PodAnnotationQoSLevelReclaimedCores,
 						ResourceUsage: nodeapis.ResourceUsage{
-							NUMAUsage: nil,
+							NUMAUsage: []nodeapis.NUMAMetricInfo{
+								{
+									NUMAId: 0,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+								{
+									NUMAId: 1,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+							},
 							GenericUsage: &nodeapis.ResourceMetric{
 								CPU:    mustParse("1"),
 								Memory: mustParse("10Gi"),
 							},
 						},
 						PodList: []string{"default/pod3"},
 					},
+					{
+						QoSLevel: apiconsts.PodAnnotationQoSLevelSystemCores,
+						ResourceUsage: nodeapis.ResourceUsage{
+							NUMAUsage: []nodeapis.NUMAMetricInfo{
+								{
+									NUMAId: 0,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+								{
+									NUMAId: 1,
+									Usage: &nodeapis.ResourceMetric{
+										Memory: mustParse("0"),
+										CPU:    mustParse("0"),
+									},
+								},
+							},
+							GenericUsage: &nodeapis.ResourceMetric{
+								CPU:    mustParse("0"),
+								Memory: mustParse("0"),
+							},
+						},
+						PodList: nil,
+					},
 				},
 			},
 		},