apiserver: move LongRunningRequestCheck type into endpoints/request

Kubernetes-commit: c1bf6e832e2887ef6cd0e7b7fa97a168fdf474e5

pkg/endpoints/request/requestcontext.go

@@ -24,6 +24,9 @@ import (
 	"github.com/golang/glog"
 )
 
+// LongRunningRequestCheck is a predicate which is true for long-running http requests.
+type LongRunningRequestCheck func(r *http.Request, requestInfo *RequestInfo) bool
+
 // RequestContextMapper keeps track of the context associated with a particular request
 type RequestContextMapper interface {
 	// Get returns the context associated with the given request (if any), and true if the request has an associated context, and false if it does not.

pkg/server/config.go

@@ -150,7 +150,7 @@ type Config struct {
 	// request has to wait.
 	MaxMutatingRequestsInFlight int
 	// Predicate which is true for paths of long-running http requests
-	LongRunningFunc genericfilters.LongRunningRequestCheck
+	LongRunningFunc apirequest.LongRunningRequestCheck
 
 	//===========================================================================
 	// values below here are targets for removal

pkg/server/filters/longrunning.go

@@ -23,11 +23,8 @@ import (
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
 
-// LongRunningRequestCheck is a predicate which is true for long-running http requests.
-type LongRunningRequestCheck func(r *http.Request, requestInfo *apirequest.RequestInfo) bool
-
 // BasicLongRunningRequestCheck returns true if the given request has one of the specified verbs or one of the specified subresources
-func BasicLongRunningRequestCheck(longRunningVerbs, longRunningSubresources sets.String) LongRunningRequestCheck {
+func BasicLongRunningRequestCheck(longRunningVerbs, longRunningSubresources sets.String) apirequest.LongRunningRequestCheck {
 	return func(r *http.Request, requestInfo *apirequest.RequestInfo) bool {
 		if longRunningVerbs.Has(requestInfo.Verb) {
 			return true

pkg/server/filters/maxinflight.go

@@ -47,7 +47,7 @@ func WithMaxInFlightLimit(
 	nonMutatingLimit int,
 	mutatingLimit int,
 	requestContextMapper genericapirequest.RequestContextMapper,
-	longRunningRequestCheck LongRunningRequestCheck,
+	longRunningRequestCheck apirequest.LongRunningRequestCheck,
 ) http.Handler {
 	if nonMutatingLimit == 0 && mutatingLimit == 0 {
 		return handler

pkg/server/filters/timeout.go

@@ -35,7 +35,7 @@ const globalTimeout = time.Minute
 var errConnKilled = fmt.Errorf("kill connection/stream")
 
 // WithTimeoutForNonLongRunningRequests times out non-long-running requests after the time given by globalTimeout.
-func WithTimeoutForNonLongRunningRequests(handler http.Handler, requestContextMapper apirequest.RequestContextMapper, longRunning LongRunningRequestCheck) http.Handler {
+func WithTimeoutForNonLongRunningRequests(handler http.Handler, requestContextMapper apirequest.RequestContextMapper, longRunning apirequest.LongRunningRequestCheck) http.Handler {
 	if longRunning == nil {
 		return handler
 	}