scheduler: enhance deviceshare error message for reservation

Signed-off-by: saintube <saintube@foxmail.com>
koordinator-sh · May 23, 2024 · 52dcaa4 · 52dcaa4
1 parent 7708b19
commit 52dcaa4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/pkg/scheduler/plugins/deviceshare/plugin_test.go b/pkg/scheduler/plugins/deviceshare/plugin_test.go
@@ -2058,7 +2058,7 @@ func Test_Plugin_FilterReservation(t *testing.T) {
 	assert.True(t, status.IsSuccess())
 
 	status = pl.FilterReservation(context.TODO(), cycleState, pod, reservationInfo, "test-node-1")
-	assert.Equal(t, framework.NewStatus(framework.Unschedulable, "node(s) no reservation(s) to meet the device requirements"), status)
+	assert.Equal(t, framework.NewStatus(framework.Unschedulable, "Insufficient gpu devices by reservation"), status)
 }
 
 func Test_Plugin_Reserve(t *testing.T) {

diff --git a/pkg/scheduler/plugins/deviceshare/reservation.go b/pkg/scheduler/plugins/deviceshare/reservation.go
@@ -198,6 +198,7 @@ func (p *Plugin) tryAllocateFromReservation(
 
 	basicPreemptible = appendAllocated(nil, basicPreemptible, restoreState.mergedMatchedAllocated)
 
+	var reservationReasons []*framework.Status
 	for _, alloc := range matchedReservations {
 		rInfo := alloc.rInfo
 		preemptibleInRR := state.preemptibleInRRs[node.Name][rInfo.UID()]
@@ -222,6 +223,7 @@ func (p *Plugin) tryAllocateFromReservation(
 				hasSatisfiedReservation = true
 				break
 			}
+			reservationReasons = append(reservationReasons, status)
 		} else if allocatePolicy == schedulingv1alpha1.ReservationAllocatePolicyRestricted {
 			_, status := allocator.Allocate(preferred, preferred, nil, preemptible)
 			if status.IsSuccess() {
@@ -236,15 +238,26 @@ func (p *Plugin) tryAllocateFromReservation(
 					hasSatisfiedReservation = true
 					break
 				}
+				reservationReasons = append(reservationReasons, status)
 			}
 		}
 	}
 	if !hasSatisfiedReservation && requiredFromReservation {
-		return nil, framework.NewStatus(framework.Unschedulable, "node(s) no reservation(s) to meet the device requirements")
+		return nil, framework.NewStatus(framework.Unschedulable, p.makePostFilterReasons(reservationReasons)...)
 	}
 	return result, nil
 }
 
+func (p *Plugin) makePostFilterReasons(reservationReasons []*framework.Status) []string {
+	var reasons []string
+	for _, status := range reservationReasons {
+		for _, r := range status.Reasons() {
+			reasons = append(reasons, fmt.Sprintf("%s by reservation", r))
+		}
+	}
+	return reasons
+}
+
 // scoreWithReservation combine the reservation with the node's resource usage to calculate the reservation score.
 func (p *Plugin) scoreWithReservation(
 	allocator *AutopilotAllocator,

diff --git a/pkg/scheduler/plugins/deviceshare/reservation_test.go b/pkg/scheduler/plugins/deviceshare/reservation_test.go
@@ -523,7 +523,7 @@ func Test_tryAllocateFromReservation(t *testing.T) {
 			},
 			requiredFromReservation: true,
 			wantResult:              nil,
-			wantStatus:              framework.NewStatus(framework.Unschedulable, "node(s) no reservation(s) to meet the device requirements"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Insufficient gpu devices by reservation"),
 		},
 		{
 			name: "failed to allocate from Aligned policy reservation that remaining little not fits request",
@@ -566,7 +566,7 @@ func Test_tryAllocateFromReservation(t *testing.T) {
 			},
 			requiredFromReservation: true,
 			wantResult:              nil,
-			wantStatus:              framework.NewStatus(framework.Unschedulable, "node(s) no reservation(s) to meet the device requirements"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Insufficient gpu devices by reservation"),
 		},
 		{
 			name: "allocate from Restricted policy reservation",
@@ -650,7 +650,7 @@ func Test_tryAllocateFromReservation(t *testing.T) {
 			},
 			requiredFromReservation: true,
 			wantResult:              nil,
-			wantStatus:              framework.NewStatus(framework.Unschedulable, "node(s) no reservation(s) to meet the device requirements"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Insufficient gpu devices by reservation"),
 		},
 	}