github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48813 from shyamjvs/fix-inflight-handler

Browse Source 
Automatic merge from submit-queue

maxinflight handler should let panicrecovery handler call NewLogged

Fixes #48700 #48782 

/cc @deads2k @sttts
This commit is contained in:
Kubernetes Submit Queue 2017-07-12 17:24:34 -07:00 committed by GitHub
commit ef229eaf51
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go
View File

@ -27,7 +27,6 @@ import (
"k8s.io/apiserver/pkg/endpoints/metrics"
apirequest "k8s.io/apiserver/pkg/endpoints/request"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
"k8s.io/apiserver/pkg/server/httplog"
"github.com/golang/glog"
)
@ -105,10 +104,6 @@ func WithMaxInFlightLimit(
}
func tooManyRequests(req *http.Request, w http.ResponseWriter) {
// "Too Many Requests" response is returned before logger is setup for the request.
// So we need to explicitly log it here.
defer httplog.NewLogged(req, &w).Log()
// Return a 429 status indicating "Too Many Requests"
w.Header().Set("Retry-After", retryAfter)
http.Error(w, "Too many requests, please try again later.", errors.StatusTooManyRequests)