Merge pull request #82187 from ahg-g/ahg-prebind

Error out when Scheduler PreBind plugins return Unschedulable

pkg/scheduler/framework/v1alpha1/framework.go

@@ -433,11 +433,6 @@ func (f *framework) RunPreBindPlugins(
 	for _, pl := range f.preBindPlugins {
 		status := pl.PreBind(pc, pod, nodeName)
 		if !status.IsSuccess() {
-			if status.IsUnschedulable() {
-				msg := fmt.Sprintf("rejected by %q at prebind: %v", pl.Name(), status.Message())
-				klog.V(4).Infof(msg)
-				return NewStatus(status.Code(), msg)
-			}
 			msg := fmt.Sprintf("error while running %q prebind plugin for pod %q: %v", pl.Name(), pod.Name, status.Message())
 			klog.Error(msg)
 			return NewStatus(Error, msg)

pkg/scheduler/scheduler.go

@@ -635,13 +635,8 @@ func (sched *Scheduler) scheduleOne() {
 		preBindStatus := fwk.RunPreBindPlugins(pluginContext, assumedPod, scheduleResult.SuggestedHost)
 		if !preBindStatus.IsSuccess() {
 			var reason string
-			if preBindStatus.IsUnschedulable() {
+			metrics.PodScheduleErrors.Inc()
-				metrics.PodScheduleFailures.Inc()
+			reason = SchedulerError
-				reason = v1.PodReasonUnschedulable
-			} else {
-				metrics.PodScheduleErrors.Inc()
-				reason = SchedulerError
-			}
 			if forgetErr := sched.Cache().ForgetPod(assumedPod); forgetErr != nil {
 				klog.Errorf("scheduler cache ForgetPod failed: %v", forgetErr)
 			}

test/integration/scheduler/framework_test.go

@@ -732,20 +732,12 @@ func TestPrebindPlugin(t *testing.T) {
 			t.Errorf("Error while creating a test pod: %v", err)
 		}
 
-		if test.fail {
+		if test.fail || test.reject {
 			if err = wait.Poll(10*time.Millisecond, 30*time.Second, podSchedulingError(cs, pod.Namespace, pod.Name)); err != nil {
 				t.Errorf("test #%v: Expected a scheduling error, but didn't get it. error: %v", i, err)
 			}
-		} else {
+		} else if err = waitForPodToSchedule(cs, pod); err != nil {
-			if test.reject {
+			t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-				if err = waitForPodUnschedulable(cs, pod); err != nil {
-					t.Errorf("test #%v: Didn't expected the pod to be scheduled. error: %v", i, err)
-				}
-			} else {
-				if err = waitForPodToSchedule(cs, pod); err != nil {
-					t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-				}
-			}
 		}
 
 		if preBindPlugin.numPreBindCalled == 0 {
@@ -810,30 +802,18 @@ func TestUnreservePlugin(t *testing.T) {
 	}
 
 	tests := []struct {
-		preBindFail   bool
+		preBindFail bool
-		preBindReject bool
 	}{
 		{
-			preBindFail:   false,
+			preBindFail: false,
-			preBindReject: false,
 		},
 		{
-			preBindFail:   true,
+			preBindFail: true,
-			preBindReject: false,
-		},
-		{
-			preBindFail:   false,
-			preBindReject: true,
-		},
-		{
-			preBindFail:   true,
-			preBindReject: true,
 		},
 	}
 
 	for i, test := range tests {
 		preBindPlugin.failPreBind = test.preBindFail
-		preBindPlugin.rejectPreBind = test.preBindReject
 
 		// Create a best effort pod.
 		pod, err := createPausePod(cs,
@@ -850,20 +830,11 @@ func TestUnreservePlugin(t *testing.T) {
 				t.Errorf("test #%v: Expected the unreserve plugin to be called %d times, was called %d times.", i, preBindPlugin.numPreBindCalled, unreservePlugin.numUnreserveCalled)
 			}
 		} else {
-			if test.preBindReject {
+			if err = waitForPodToSchedule(cs, pod); err != nil {
-				if err = waitForPodUnschedulable(cs, pod); err != nil {
+				t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-					t.Errorf("test #%v: Didn't expected the pod to be scheduled. error: %v", i, err)
+			}
-				}
+			if unreservePlugin.numUnreserveCalled > 0 {
-				if unreservePlugin.numUnreserveCalled == 0 {
+				t.Errorf("test #%v: Didn't expected the unreserve plugin to be called, was called %d times.", i, unreservePlugin.numUnreserveCalled)
-					t.Errorf("test #%v: Expected the unreserve plugin to be called %d times, was called %d times.", i, preBindPlugin.numPreBindCalled, unreservePlugin.numUnreserveCalled)
-				}
-			} else {
-				if err = waitForPodToSchedule(cs, pod); err != nil {
-					t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-				}
-				if unreservePlugin.numUnreserveCalled > 0 {
-					t.Errorf("test #%v: Didn't expected the unreserve plugin to be called, was called %d times.", i, unreservePlugin.numUnreserveCalled)
-				}
 			}
 		}
 
@@ -1122,26 +1093,15 @@ func TestPostBindPlugin(t *testing.T) {
 		preBindReject bool
 	}{
 		{
-			preBindFail:   false,
+			preBindFail: false,
-			preBindReject: false,
 		},
 		{
-			preBindFail:   true,
+			preBindFail: true,
-			preBindReject: false,
-		},
-		{
-			preBindFail:   false,
-			preBindReject: true,
-		},
-		{
-			preBindFail:   true,
-			preBindReject: true,
 		},
 	}
 
 	for i, test := range tests {
 		preBindPlugin.failPreBind = test.preBindFail
-		preBindPlugin.rejectPreBind = test.preBindReject
 
 		// Create a best effort pod.
 		pod, err := createPausePod(cs,
@@ -1158,20 +1118,11 @@ func TestPostBindPlugin(t *testing.T) {
 				t.Errorf("test #%v: Didn't expected the postbind plugin to be called %d times.", i, postBindPlugin.numPostBindCalled)
 			}
 		} else {
-			if test.preBindReject {
+			if err = waitForPodToSchedule(cs, pod); err != nil {
-				if err = waitForPodUnschedulable(cs, pod); err != nil {
+				t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-					t.Errorf("test #%v: Didn't expected the pod to be scheduled. error: %v", i, err)
+			}
-				}
+			if postBindPlugin.numPostBindCalled == 0 {
-				if postBindPlugin.numPostBindCalled > 0 {
+				t.Errorf("test #%v: Expected the postbind plugin to be called, was called %d times.", i, postBindPlugin.numPostBindCalled)
-					t.Errorf("test #%v: Didn't expected the postbind plugin to be called %d times.", i, postBindPlugin.numPostBindCalled)
-				}
-			} else {
-				if err = waitForPodToSchedule(cs, pod); err != nil {
-					t.Errorf("test #%v: Expected the pod to be scheduled. error: %v", i, err)
-				}
-				if postBindPlugin.numPostBindCalled == 0 {
-					t.Errorf("test #%v: Expected the postbind plugin to be called, was called %d times.", i, postBindPlugin.numPostBindCalled)
-				}
 			}
 		}