adapt to Preemption interface change

Author: Huang-Wei

pkg/capacityscheduling/capacity_scheduling.go

@@ -376,6 +376,10 @@ type preemptor struct {
 	state *framework.CycleState
 }
 
+func (p *preemptor) OrderedScoreFuncs(ctx context.Context, nodesToVictims map[string]*extenderv1.Victims) []func(node string) int64 {
+	return nil
+}
+
 func (p *preemptor) GetOffsetAndNumCandidates(n int32) (int32, int32) {
 	return 0, n
 }
@@ -493,8 +497,9 @@ func (p *preemptor) SelectVictimsOnNode(
 	var nominatedPodsReqWithPodReq framework.Resource
 	podReq := preFilterState.podReq
 
+	logger := klog.FromContext(ctx)
 	removePod := func(rpi *framework.PodInfo) error {
-		if err := nodeInfo.RemovePod(rpi.Pod); err != nil {
+		if err := nodeInfo.RemovePod(logger, rpi.Pod); err != nil {
 			return err
 		}
 		status := p.fh.RunPreFilterExtensionRemovePod(ctx, state, pod, rpi, nodeInfo)

pkg/coscheduling/core/core.go

@@ -200,7 +200,7 @@ func (pgMgr *PodGroupManager) PreFilter(ctx context.Context, pod *corev1.Pod) er
 	minResources := pg.Spec.MinResources.DeepCopy()
 	podQuantity := resource.NewQuantity(int64(pg.Spec.MinMember), resource.DecimalSI)
 	minResources[corev1.ResourcePods] = *podQuantity
-	err = CheckClusterResource(nodes, minResources, pgFullName)
+	err = CheckClusterResource(ctx, nodes, minResources, pgFullName)
 	if err != nil {
 		klog.ErrorS(err, "Failed to PreFilter", "podGroup", klog.KObj(pg))
 		return err
@@ -295,13 +295,13 @@ func (pgMgr *PodGroupManager) CalculateAssignedPods(podGroupName, namespace stri
 
 // CheckClusterResource checks if resource capacity of the cluster can satisfy <resourceRequest>.
 // It returns an error detailing the resource gap if not satisfied; otherwise returns nil.
-func CheckClusterResource(nodeList []*framework.NodeInfo, resourceRequest corev1.ResourceList, desiredPodGroupName string) error {
+func CheckClusterResource(ctx context.Context, nodeList []*framework.NodeInfo, resourceRequest corev1.ResourceList, desiredPodGroupName string) error {
 	for _, info := range nodeList {
 		if info == nil || info.Node() == nil {
 			continue
 		}
 
-		nodeResource := util.ResourceList(getNodeResource(info, desiredPodGroupName))
+		nodeResource := util.ResourceList(getNodeResource(ctx, info, desiredPodGroupName))
 		for name, quant := range resourceRequest {
 			quant.Sub(nodeResource[name])
 			if quant.Sign() <= 0 {
@@ -322,16 +322,17 @@ func GetNamespacedName(obj metav1.Object) string {
 	return fmt.Sprintf("%v/%v", obj.GetNamespace(), obj.GetName())
 }
 
-func getNodeResource(info *framework.NodeInfo, desiredPodGroupName string) *framework.Resource {
-	nodeClone := info.Clone()
+func getNodeResource(ctx context.Context, info *framework.NodeInfo, desiredPodGroupName string) *framework.Resource {
+	nodeClone := info.Snapshot()
+	logger := klog.FromContext(ctx)
 	for _, podInfo := range info.Pods {
 		if podInfo == nil || podInfo.Pod == nil {
 			continue
 		}
 		if util.GetPodGroupFullName(podInfo.Pod) != desiredPodGroupName {
 			continue
 		}
-		nodeClone.RemovePod(podInfo.Pod)
+		nodeClone.RemovePod(logger, podInfo.Pod)
 	}
 
 	leftResource := framework.Resource{

pkg/coscheduling/core/core_test.go

@@ -349,7 +349,7 @@ func TestCheckClusterResource(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			snapshotSharedLister := tu.NewFakeSharedLister(tt.existingPods, nodes)
 			nodeInfoList, _ := snapshotSharedLister.NodeInfos().List()
-			err := CheckClusterResource(nodeInfoList, tt.minResources, tt.pgName)
+			err := CheckClusterResource(context.Background(), nodeInfoList, tt.minResources, tt.pgName)
 			if (err == nil) != tt.want {
 				t.Errorf("Expect the cluster resource to be satified: %v, but got %v", tt.want, err == nil)
 			}

pkg/preemptiontoleration/preemption_toleration.go

@@ -69,6 +69,10 @@ type PreemptionToleration struct {
 	curTime time.Time
 }
 
+func (pl *PreemptionToleration) OrderedScoreFuncs(ctx context.Context, nodesToVictims map[string]*extenderv1.Victims) []func(node string) int64 {
+	return nil
+}
+
 // Name returns name of the plugin. It is used in logs, etc.
 func (pl *PreemptionToleration) Name() string {
 	return Name
@@ -184,8 +188,9 @@ func (pl *PreemptionToleration) SelectVictimsOnNode(
 	nodeInfo *framework.NodeInfo,
 	pdbs []*policy.PodDisruptionBudget) ([]*v1.Pod, int, *framework.Status) {
 	var potentialVictims []*framework.PodInfo
+	logger := klog.FromContext(ctx)
 	removePod := func(rpi *framework.PodInfo) error {
-		if err := nodeInfo.RemovePod(rpi.Pod); err != nil {
+		if err := nodeInfo.RemovePod(logger, rpi.Pod); err != nil {
 			return err
 		}
 		status := pl.fh.RunPreFilterExtensionRemovePod(ctx, state, preemptor, rpi, nodeInfo)