Fix error message for max tail connections. (#2161)

* Fix error message for max tail connections.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>

* Fixes a test.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
pull/2178/head
Cyril Tovena 5 years ago committed by GitHub
parent 8dc9a9cd91
commit b95db8d1fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      pkg/querier/querier.go
  2. 2
      pkg/querier/querier_test.go

@ -559,10 +559,10 @@ func (q *Querier) checkTailRequestLimit(ctx context.Context) error {
maxCnt = r
}
}
if maxCnt >= uint32(q.limits.MaxConcurrentTailRequests(userID)) {
l := uint32(q.limits.MaxConcurrentTailRequests(userID))
if maxCnt >= l {
return httpgrpc.Errorf(http.StatusBadRequest,
"max concurrent tail requests limit exceeded, count > limit (%d > %d)", maxCnt+1, 1)
"max concurrent tail requests limit exceeded, count > limit (%d > %d)", maxCnt+1, l)
}
return nil

@ -558,7 +558,7 @@ func TestQuerier_concurrentTailLimits(t *testing.T) {
"ring containing one active ingester and max active tailers": {
ringIngesters: []ring.IngesterDesc{mockIngesterDesc("1.1.1.1", ring.ACTIVE)},
expectedError: httpgrpc.Errorf(http.StatusBadRequest,
"max concurrent tail requests limit exceeded, count > limit (%d > %d)", 6, 1),
"max concurrent tail requests limit exceeded, count > limit (%d > %d)", 6, 5),
tailersCount: 5,
},
}

Loading…
Cancel
Save