fix(sysadvisor): check pod number for dedicated region

Signed-off-by: linzhecheng <linzhecheng@bytedance.com>
kubewharf · Sep 21, 2023 · c440dce · c440dce
1 parent 5813398
commit c440dce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.../sysadvisor/plugin/qosaware/resource/cpu/assembler/provisionassembler/assembler_common.go b/.../sysadvisor/plugin/qosaware/resource/cpu/assembler/provisionassembler/assembler_common.go
@@ -108,8 +108,8 @@ func (pa *ProvisionAssemblerCommon) AssembleProvision() (types.InternalCPUCalcul
 			reservedForReclaim := pa.getNumasReservedForReclaim(r.GetBindingNumas())
 
 			podSet := r.GetPods()
-			if podSet.Len() != 1 {
-				return types.InternalCPUCalculationResult{}, false, fmt.Errorf("more than one pod are assgined to numa exclusive region")
+			if podSet.Pods() != 1 {
+				return types.InternalCPUCalculationResult{}, false, fmt.Errorf("more than one pod are assgined to numa exclusive region: %v", podSet)
 			}
 			podUID, _, _ := podSet.PopAny()
 

diff --git a/pkg/agent/sysadvisor/types/helper.go b/pkg/agent/sysadvisor/types/helper.go
@@ -221,12 +221,14 @@ func (ps PodSet) PopAny() (string, string, bool) {
 	return zeroValue, zeroValue, false
 }
 
-func (ps PodSet) Len() int {
-	length := 0
+func (ps PodSet) Pods() int {
+	count := 0
 	for _, containerNames := range ps {
-		length += containerNames.Len()
+		if containerNames.Len() > 0 {
+			count++
+		}
 	}
-	return length
+	return count
 }
 
 func (r *InternalCPUCalculationResult) GetPoolEntry(poolName string, numaID int) (int, bool) {