Skip to content

K
k3s
Commit ef229eaf authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents b31d1db4 6ffbbad2
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 5 deletions
staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go
View file @ ef229eaf
...@@ -27,7 +27,6 @@ import ( ...@@ -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( ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment