Merge pull request #63537 from fisherxu/returnErr

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Return error when has no RequestInfo in handlerchain **What this PR does / why we need it**: we should return error when has no RequestInfo. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #63537 from fisherxu/returnErr
5d6997ad · Kubernetes Submit Queue · GitHub · 0949cefd · 483ce1b1 · 5d6997ad
Unverified Commit 5d6997ad authored May 09, 2018 by Kubernetes Submit Queue Committed by GitHub May 09, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

BUILD staging/src/k8s.io/apiserver/pkg/server/filters/BUILD +1 -0

waitgroup.go staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go +3 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/filters/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/server/filters/BUILD
@@ -49,6 +49,7 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/waitgroup:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/authentication/user:go_default_library",
+        "//vendor/k8s.io/apiserver/pkg/endpoints/handlers/responsewriters:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/endpoints/metrics:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/endpoints/request:go_default_library",
        "//vendor/k8s.io/apiserver/pkg/server/httplog:go_default_library",

--- a/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/filters/waitgroup.go
@@ -17,9 +17,11 @@ limitations under the License.
 package filters
 import (
+	"errors"
 	"net/http"
 	utilwaitgroup "k8s.io/apimachinery/pkg/util/waitgroup"
+	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 )
@@ -30,7 +32,7 @@ func WithWaitGroup(handler http.Handler, longRunning apirequest.LongRunningReque
 		requestInfo, ok := apirequest.RequestInfoFrom(ctx)
 		if !ok {
 			// if this happens, the handler chain isn't setup correctly because there is no request info
-			handler.ServeHTTP(w, req)
+			responsewriters.InternalError(w, req, errors.New("no RequestInfo found in the context"))
 			return
 		}