mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #48813 from shyamjvs/fix-inflight-handler
Automatic merge from submit-queue maxinflight handler should let panicrecovery handler call NewLogged Fixes #48700 #48782 /cc @deads2k @sttts
This commit is contained in:
commit
ef229eaf51
@ -27,7 +27,6 @@ import (
|
|||||||
"k8s.io/apiserver/pkg/endpoints/metrics"
|
"k8s.io/apiserver/pkg/endpoints/metrics"
|
||||||
apirequest "k8s.io/apiserver/pkg/endpoints/request"
|
apirequest "k8s.io/apiserver/pkg/endpoints/request"
|
||||||
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
|
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
|
||||||
"k8s.io/apiserver/pkg/server/httplog"
|
|
||||||
|
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
)
|
)
|
||||||
@ -105,10 +104,6 @@ func WithMaxInFlightLimit(
|
|||||||
}
|
}
|
||||||
|
|
||||||
func tooManyRequests(req *http.Request, w http.ResponseWriter) {
|
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"
|
// Return a 429 status indicating "Too Many Requests"
|
||||||
w.Header().Set("Retry-After", retryAfter)
|
w.Header().Set("Retry-After", retryAfter)
|
||||||
http.Error(w, "Too many requests, please try again later.", errors.StatusTooManyRequests)
|
http.Error(w, "Too many requests, please try again later.", errors.StatusTooManyRequests)
|
||||||
|
Loading…
Reference in New Issue
Block a user