scheduler: refine reservation ignored

Signed-off-by: saintube <saintube@foxmail.com>

apis/extension/reservation.go

@@ -33,7 +33,6 @@ const (
 	// reserved resources unallocated of all reservations on the node. If a pod scheduled with this label on a node,
 	// the reservations of the node will not consider the pod as their owners. To avoid the pods setting with this label
 	// to block the other pods allocated reserved resources, it should be used with the reservation preemption.
-	// It is similar to match all reservations with the default allocate policy.
 	LabelReservationIgnored = SchedulingDomainPrefix + "/reservation-ignored"
 
 	// LabelReservationOrder controls the preference logic for Reservation.

apis/scheduling/v1alpha1/reservation_types.go

@@ -76,6 +76,8 @@ type ReservationAllocatePolicy string
 const (
 	// ReservationAllocatePolicyDefault means that there is no restriction on the policy of reserved resources,
 	// and allocated from the Reservation first, and if it is insufficient, it is allocated from the node.
+	// DEPRECATED: ReservationAllocatePolicyDefault is deprecated, it is considered as Aligned if specified.
+	// Please try other polices or set LabelReservationIgnored instead.
 	ReservationAllocatePolicyDefault ReservationAllocatePolicy = ""
 	// ReservationAllocatePolicyAligned indicates that the Pod allocates resources from the Reservation first.
 	// If the remaining resources of the Reservation are insufficient, it can be allocated from the node,

pkg/scheduler/plugins/deviceshare/reservation.go

@@ -278,19 +278,16 @@ func (p *Plugin) tryAllocateIgnoreReservation(
 	requiredFromReservation bool,
 ) (apiext.DeviceAllocations, *framework.Status) {
 	preemptibleFromIgnored := map[schedulingv1alpha1.DeviceType]deviceResources{}
-	allocatableFromIgnored := map[schedulingv1alpha1.DeviceType]deviceResources{}
 
 	// accumulate all ignored reserved resources which are not allocated to any owner pods
 	for _, alloc := range ignoredReservations {
 		preemptibleFromIgnored = appendAllocated(preemptibleFromIgnored,
 			state.preemptibleInRRs[node.Name][alloc.rInfo.UID()], alloc.remained)
-		allocatableFromIgnored = appendAllocated(allocatableFromIgnored, alloc.allocatable)
 	}
 
 	preemptibleFromIgnored = appendAllocated(preemptibleFromIgnored, basicPreemptible, restoreState.mergedMatchedAllocated)
-	preferred := newDeviceMinorMap(allocatableFromIgnored)
 
-	return allocator.Allocate(nil, preferred, nil, preemptibleFromIgnored)
+	return allocator.Allocate(nil, nil, nil, preemptibleFromIgnored)
 }
 
 func (p *Plugin) makeReasonsByReservation(reservationReasons []*framework.Status) []string {