diff options
| author | karthik nayak <knayak@gitlab.com> | 2023-05-02 14:25:32 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2023-05-02 14:25:32 +0300 |
| commit | 308b5daa0d527660cae0121ee9ce5e98e290d1ad (patch) | |
| tree | 3efe4f585173c9c1a1670c7af2fa882dd1f7845f | |
| parent | efb5e4f6b2cf487c91725e4c928f2b4e4f1c2e3b (diff) | |
| parent | c65d6282e7e358c3b02bc36e0d4cb6a3049b9990 (diff) | |
Merge branch 'qmnguyen0711/fix-zero-max-queue-wait' into 'master'
Set manual ticker when PackObjectsLimiting.MaxQueueWait is zero
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5713
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
| -rw-r--r-- | internal/cli/gitaly/serve.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/internal/cli/gitaly/serve.go b/internal/cli/gitaly/serve.go index 37997859d..b7abd6654 100644 --- a/internal/cli/gitaly/serve.go +++ b/internal/cli/gitaly/serve.go @@ -271,12 +271,18 @@ func run(cfg config.Cfg) error { string(cfg.PackObjectsLimiting.Key), cfg.Prometheus.GRPCLatencyBuckets, ) + newTickerFunc := func() helper.Ticker { + return helper.NewManualTicker() + } + if cfg.PackObjectsLimiting.MaxQueueWait > 0 { + newTickerFunc = func() helper.Ticker { + return helper.NewTimerTicker(cfg.PackObjectsLimiting.MaxQueueWait.Duration()) + } + } packObjectsLimiter := limithandler.NewConcurrencyLimiter( cfg.PackObjectsLimiting.MaxConcurrency, cfg.PackObjectsLimiting.MaxQueueLength, - func() helper.Ticker { - return helper.NewTimerTicker(cfg.PackObjectsLimiting.MaxQueueWait.Duration()) - }, + newTickerFunc, packObjectsMonitor, ) |