Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjohn.mcdonnell <jmcdonnell@gitlab.com>2022-11-15 15:11:59 +0300
committerJohn McDonnell <jmcdonnell@gitlab.com>2023-04-11 13:27:53 +0300
commit3087263e88d422b2ae50581d6e2efed4eb9a1ad3 (patch)
tree69b52589ccdd91a61b071598968216aff6143d2c
parent0270b952e5bff22707247670520c695401715e25 (diff)
concurrency_limiter: Update ErrMaxQueueSize to be more descriptive
-rw-r--r--internal/middleware/limithandler/concurrency_limiter.go2
-rw-r--r--internal/middleware/limithandler/middleware_test.go10
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/middleware/limithandler/concurrency_limiter.go b/internal/middleware/limithandler/concurrency_limiter.go
index d200ac8ae..bd6bcd8f0 100644
--- a/internal/middleware/limithandler/concurrency_limiter.go
+++ b/internal/middleware/limithandler/concurrency_limiter.go
@@ -22,7 +22,7 @@ import (
var ErrMaxQueueTime = errors.New("maximum time in concurrency queue reached")
// ErrMaxQueueSize indicates the concurrency queue has reached its maximum size
-var ErrMaxQueueSize = errors.New("maximum queue size reached")
+var ErrMaxQueueSize = errors.New("maximum global concurrency queue size reached")
// QueueTickerCreator is a function that provides a ticker
type QueueTickerCreator func() helper.Ticker
diff --git a/internal/middleware/limithandler/middleware_test.go b/internal/middleware/limithandler/middleware_test.go
index 96bb11eed..342b84fec 100644
--- a/internal/middleware/limithandler/middleware_test.go
+++ b/internal/middleware/limithandler/middleware_test.go
@@ -252,7 +252,7 @@ func TestStreamLimitHandler(t *testing.T) {
expectedResponseCount: 4,
expectedErr: structerr.NewResourceExhausted("%w", limithandler.ErrMaxQueueSize).WithDetail(
&gitalypb.LimitError{
- ErrorMessage: "maximum queue size reached",
+ ErrorMessage: "maximum global concurrency queue size reached",
RetryAfter: durationpb.New(0),
},
),
@@ -282,7 +282,7 @@ func TestStreamLimitHandler(t *testing.T) {
expectedResponseCount: 4,
expectedErr: structerr.NewResourceExhausted("%w", limithandler.ErrMaxQueueSize).WithDetail(
&gitalypb.LimitError{
- ErrorMessage: "maximum queue size reached",
+ ErrorMessage: "maximum global concurrency queue size reached",
RetryAfter: durationpb.New(0),
},
),
@@ -314,7 +314,7 @@ func TestStreamLimitHandler(t *testing.T) {
expectedResponseCount: 4,
expectedErr: structerr.NewResourceExhausted("%w", limithandler.ErrMaxQueueSize).WithDetail(
&gitalypb.LimitError{
- ErrorMessage: "maximum queue size reached",
+ ErrorMessage: "maximum global concurrency queue size reached",
RetryAfter: durationpb.New(0),
},
),
@@ -368,7 +368,7 @@ func TestStreamLimitHandler(t *testing.T) {
expectedResponseCount: 4,
expectedErr: structerr.NewResourceExhausted("%w", limithandler.ErrMaxQueueSize).WithDetail(
&gitalypb.LimitError{
- ErrorMessage: "maximum queue size reached",
+ ErrorMessage: "maximum global concurrency queue size reached",
RetryAfter: durationpb.New(0),
},
),
@@ -518,7 +518,7 @@ func TestStreamLimitHandler_error(t *testing.T) {
require.True(t, ok)
testhelper.ProtoEqual(t, []interface{}{&gitalypb.LimitError{
- ErrorMessage: "maximum queue size reached",
+ ErrorMessage: "maximum global concurrency queue size reached",
RetryAfter: &durationpb.Duration{},
}}, st.Details())