From b13e22482eac7a1964a8d1c900fe9e1908f67eee Mon Sep 17 00:00:00 2001 From: Bai Jianfei Date: Sun, 22 Dec 2019 17:24:53 +0800 Subject: [PATCH] Count dropped requests except system previledged group requests. --- .../apiserver/pkg/server/filters/maxinflight.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go index 099e23e14fb..b7b61419d5c 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/maxinflight.go @@ -160,14 +160,6 @@ func WithMaxInFlightLimit( handler.ServeHTTP(w, r) default: - // We need to split this data between buckets used for throttling. - if isMutatingRequest { - metrics.DroppedRequests.WithLabelValues(metrics.MutatingKind).Inc() - metrics.DeprecatedDroppedRequests.WithLabelValues(metrics.MutatingKind).Inc() - } else { - metrics.DroppedRequests.WithLabelValues(metrics.ReadOnlyKind).Inc() - metrics.DeprecatedDroppedRequests.WithLabelValues(metrics.ReadOnlyKind).Inc() - } // at this point we're about to return a 429, BUT not all actors should be rate limited. A system:master is so powerful // that they should always get an answer. It's a super-admin or a loopback connection. if currUser, ok := apirequest.UserFrom(ctx); ok { @@ -178,6 +170,14 @@ func WithMaxInFlightLimit( } } } + // We need to split this data between buckets used for throttling. + if isMutatingRequest { + metrics.DroppedRequests.WithLabelValues(metrics.MutatingKind).Inc() + metrics.DeprecatedDroppedRequests.WithLabelValues(metrics.MutatingKind).Inc() + } else { + metrics.DroppedRequests.WithLabelValues(metrics.ReadOnlyKind).Inc() + metrics.DeprecatedDroppedRequests.WithLabelValues(metrics.ReadOnlyKind).Inc() + } metrics.RecordRequestTermination(r, requestInfo, metrics.APIServerComponent, http.StatusTooManyRequests) tooManyRequests(r, w) }