Merge pull request #631 from csfldf/dev/fix_rampup_cpu

fix(qrm): make ramp up cpus not overlapping with cpus in NUMAs containing NUMA_binding pods

Author: luomingmeng

pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_advisor_handler.go

@@ -539,12 +539,12 @@ func (p *DynamicPolicy) applyBlocks(blockCPUSet advisorapi.BlockCPUSet, resp *ad
 		return fmt.Errorf("GetSharedBindingNUMAs failed with error: %v", err)
 	}
 	sharedBindingNUMACPUs := p.machineInfo.CPUDetails.CPUsInNUMANodes(sharedBindingNUMAs.UnsortedList()...)
-	// rampUpCPUs include reclaim pool
+	// rampUpCPUs include reclaim pool in NUMAs without NUMA_binding cpus
 	rampUpCPUs := p.machineInfo.CPUDetails.CPUs().
 		Difference(p.reservedCPUs).
 		Difference(dedicatedCPUSet).
-		Difference(sharedBindingNUMACPUs).
-		Union(newEntries[state.PoolNameReclaim][state.FakedContainerName].AllocationResult)
+		Difference(sharedBindingNUMACPUs)
+
 	rampUpCPUsTopologyAwareAssignments, err := machine.GetNumaAwareAssignments(p.machineInfo.CPUTopology, rampUpCPUs)
 	if err != nil {
 		return fmt.Errorf("unable to calculate topologyAwareAssignments for rampUpCPUs, result cpuset: %s, error: %v",

pkg/agent/qrm-plugins/cpu/dynamicpolicy/policy_allocation_handlers.go

@@ -68,9 +68,7 @@ func (p *DynamicPolicy) sharedCoresWithoutNUMABindingAllocationHandler(_ context
 
 	machineState := p.state.GetMachineState()
 	pooledCPUs := machineState.GetFilteredAvailableCPUSet(p.reservedCPUs,
-		func(ai *state.AllocationInfo) bool {
-			return state.CheckDedicated(ai) || state.CheckNUMABinding(ai)
-		}, state.CheckDedicatedNUMABinding)
+		state.CheckDedicated, state.CheckNUMABinding)
 
 	if pooledCPUs.IsEmpty() {
 		general.Errorf("pod: %s/%s, container: %s get empty pooledCPUs", req.PodNamespace, req.PodName, req.ContainerName)
@@ -880,12 +878,11 @@ func (p *DynamicPolicy) applyPoolsAndIsolatedInfo(poolsCPUSet map[string]machine
 	}
 
 	sharedBindingNUMACPUs := p.machineInfo.CPUDetails.CPUsInNUMANodes(sharedBindingNUMAs.UnsortedList()...)
-	// rampUpCPUs include reclaim pool
+	// rampUpCPUs include reclaim pool in NUMAs without NUMA_binding cpus
 	rampUpCPUs := machineState.GetFilteredAvailableCPUSet(p.reservedCPUs,
 		nil, state.CheckDedicatedNUMABinding).
 		Difference(unionDedicatedIsolatedCPUSet).
-		Difference(sharedBindingNUMACPUs).
-		Union(poolsCPUSet[state.PoolNameReclaim])
+		Difference(sharedBindingNUMACPUs)
 
 	rampUpCPUsTopologyAwareAssignments, err := machine.GetNumaAwareAssignments(p.machineInfo.CPUTopology, rampUpCPUs)
 	if err != nil {