Merge pull request #105647 from wojtek-t/disable_pf_for_watches

Disable P&F for watch requests

staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/mutating_work_estimator.go

@@ -41,6 +41,12 @@ const (
 )
 
 func (e *mutatingWorkEstimator) estimate(r *http.Request) WorkEstimate {
+	// TODO(wojtekt): Remove once we tune the algorithm to not fail
+	// scalability tests.
+	return WorkEstimate{
+		InitialSeats: 1,
+	}
+
 	requestInfo, ok := apirequest.RequestInfoFrom(r.Context())
 	if !ok {
 		// no RequestInfo should never happen, but to be on the safe side
@@ -51,7 +57,6 @@ func (e *mutatingWorkEstimator) estimate(r *http.Request) WorkEstimate {
 			AdditionalLatency: eventAdditionalDuration,
 		}
 	}
-
 	watchCount := e.countFn(requestInfo)
 
 	// The cost of the request associated with the watchers of that event

staging/src/k8s.io/apiserver/pkg/util/flowcontrol/request/width_test.go

@@ -252,6 +252,9 @@ func TestWorkEstimator(t *testing.T) {
 			countErr:             errors.New("unknown error"),
 			initialSeatsExpected: maximumSeats,
 		},
+		// TODO(wojtekt): Reenable these tests after tuning algorithm to
+		// not fail scalability tests.
+		/*
 			{
 				name:       "request verb is create, no watches",
 				requestURI: "http://server/apis/foo.bar/v1/foos",
@@ -378,6 +381,7 @@ func TestWorkEstimator(t *testing.T) {
 				finalSeatsExpected:        3,
 				additionalLatencyExpected: 5 * time.Millisecond,
 			},
+		*/
 	}
 
 	for _, test := range tests {