scheduler: add node info in reservation level event (#2094)

Signed-off-by: 佑祎 <zzw261520@alibaba-inc.com>
koordinator-sh · Jun 11, 2024 · 100d4a5 · 100d4a5
1 parent b208bdf
commit 100d4a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/pkg/scheduler/frameworkext/eventhandlers/reservation_handler.go b/pkg/scheduler/frameworkext/eventhandlers/reservation_handler.go
@@ -145,7 +145,7 @@ func generatePodEventOnReservationLevel(errorMsg string) (string, bool) {
 	reserveTotalRe := regexp.MustCompile("^([0-9]+) Reservation\\(s\\) matched owner total$")
 
 	// for node related item
-	reserveNodeDetailRe := regexp.MustCompile("^([0-9]+ Reservation\\(s\\)) for node reason that (.*)$")
+	reserveNodeDetailRe := regexp.MustCompile("^([0-9]+ Reservation\\(s\\)) (for node reason that .*)$")
 
 	// for reservation detail item
 	reserveDetailRe := regexp.MustCompile("^([0-9]+) Reservation\\(s\\) .*$")

diff --git a/pkg/scheduler/frameworkext/eventhandlers/reservation_handler_test.go b/pkg/scheduler/frameworkext/eventhandlers/reservation_handler_test.go
@@ -1349,7 +1349,7 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"3 Reservation(s) for node reason that didn't match pod topology spread constraints (missing required label), " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory, " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod topology spread constraints (missing required label), " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod topology spread constraints (missing required label), " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1360,7 +1360,7 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"3 Reservation(s) for node reason that didn't match pod topology spread constraints," +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod topology spread constraints, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod topology spread constraints, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1371,7 +1371,7 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"3 Reservation(s) for node reason that didn't satisfy existing pods anti-affinity rules," +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't satisfy existing pods anti-affinity rules, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't satisfy existing pods anti-affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1382,7 +1382,7 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"3 Reservation(s) for node reason that didn't match pod affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod affinity rules, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1393,7 +1393,7 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"3 Reservation(s) for node reason that didn't match pod anti-affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod anti-affinity rules, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod anti-affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1406,8 +1406,8 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"1 Reservation(s) for node reason that didn't match pod affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod topology spread constraints, " +
-				"1 Reservation(s) didn't match pod affinity rules, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod topology spread constraints, " +
+				"1 Reservation(s) for node reason that didn't match pod affinity rules, " +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},
@@ -1419,8 +1419,8 @@ func Test_generatePodEventOnReservationLevel(t *testing.T) {
 				"2 Reservation(s) for node reason that didn't match pod affinity rules," +
 				"2 Reservation(s) Insufficient cpu, 1 Reservation(s) Insufficient memory. " +
 				"8 Reservation(s) matched owner total.",
-			wantMsg: "0/8 reservations are available: 3 Reservation(s) didn't match pod topology spread constraints, " +
-				"2 Reservation(s) didn't match pod affinity rules, 2 Reservation(s) Insufficient cpu, " +
+			wantMsg: "0/8 reservations are available: 3 Reservation(s) for node reason that didn't match pod topology spread constraints, " +
+				"2 Reservation(s) for node reason that didn't match pod affinity rules, 2 Reservation(s) Insufficient cpu, " +
 				"1 Reservation(s) Insufficient memory.",
 			wantIsReserve: true,
 		},