scheduler: enhance deviceshare error message for reservation

Signed-off-by: saintube <saintube@foxmail.com>
koordinator-sh · May 23, 2024 · 2ef40d5 · 2ef40d5
1 parent 7f259d5
commit 2ef40d5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 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, "Insufficient gpu devices by reservation"), status)
+	assert.Equal(t, framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient gpu devices"), status)
 }
 
 func Test_Plugin_Reserve(t *testing.T) {

diff --git a/pkg/scheduler/plugins/deviceshare/reservation.go b/pkg/scheduler/plugins/deviceshare/reservation.go
@@ -252,7 +252,7 @@ func (p *Plugin) makeReasonsByReservation(reservationReasons []*framework.Status
 	var reasons []string
 	for _, status := range reservationReasons {
 		for _, r := range status.Reasons() {
-			reasons = append(reasons, fmt.Sprintf("%s by reservation", r))
+			reasons = append(reasons, fmt.Sprintf("Reservation(s) %s", r))
 		}
 	}
 	return reasons

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, "Insufficient gpu devices by reservation"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient gpu devices"),
 		},
 		{
 			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, "Insufficient gpu devices by reservation"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient gpu devices"),
 		},
 		{
 			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, "Insufficient gpu devices by reservation"),
+			wantStatus:              framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient gpu devices"),
 		},
 	}
 

diff --git a/pkg/scheduler/plugins/reservation/plugin.go b/pkg/scheduler/plugins/reservation/plugin.go
@@ -434,7 +434,7 @@ func (pl *Plugin) filterWithReservations(ctx context.Context, cycleState *framew
 			failureReasons = append(failureReasons, fmt.Sprintf("Insufficient %s by node", insufficientResourceByNode))
 		}
 		for _, insufficientResourceByReservation := range allInsufficientResourcesByReservation {
-			failureReasons = append(failureReasons, fmt.Sprintf("Insufficient %s by reservation", insufficientResourceByReservation))
+			failureReasons = append(failureReasons, fmt.Sprintf("Reservation(s) Insufficient %s", insufficientResourceByReservation))
 		}
 		if len(failureReasons) == 0 {
 			failureReasons = append(failureReasons, ErrReasonNoReservationsMeetRequirements)

diff --git a/pkg/scheduler/plugins/reservation/plugin_test.go b/pkg/scheduler/plugins/reservation/plugin_test.go
@@ -870,7 +870,7 @@ func Test_filterWithReservations(t *testing.T) {
 					},
 				},
 			},
-			wantStatus: framework.NewStatus(framework.Unschedulable, "Insufficient cpu by reservation"),
+			wantStatus: framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient cpu"),
 		},
 		{
 			name: "filter default reservations with preemption",
@@ -1160,7 +1160,7 @@ func Test_filterWithReservations(t *testing.T) {
 					},
 				},
 			},
-			wantStatus: framework.NewStatus(framework.Unschedulable, "Insufficient cpu by reservation"),
+			wantStatus: framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient cpu"),
 		},
 		{
 			name: "failed to filter multiple restricted reservations with preempt from node",
@@ -1227,7 +1227,7 @@ func Test_filterWithReservations(t *testing.T) {
 					},
 				},
 			},
-			wantStatus: framework.NewStatus(framework.Unschedulable, "Insufficient cpu by reservation", "Insufficient cpu by reservation"),
+			wantStatus: framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient cpu", "Reservation(s) Insufficient cpu"),
 		},
 		{
 			name: "failed to filter restricted reservations with preempt from reservation and node",
@@ -1284,7 +1284,7 @@ func Test_filterWithReservations(t *testing.T) {
 					},
 				},
 			},
-			wantStatus: framework.NewStatus(framework.Unschedulable, "Insufficient cpu by reservation"),
+			wantStatus: framework.NewStatus(framework.Unschedulable, "Reservation(s) Insufficient cpu"),
 		},
 		{
 			name: "filter restricted reservations with preempt from reservation and node",