Commit 5544d2b3 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'reduce-sidekiq-wait-timings' into 'master'

Reduce wait timings for Sidekiq jobs

See merge request !12270
parents 757c537f d505a2b8
...@@ -34,7 +34,7 @@ module Users ...@@ -34,7 +34,7 @@ module Users
# Keep trying until we obtain the lease. If we don't do so we may end up # Keep trying until we obtain the lease. If we don't do so we may end up
# not updating the list of authorized projects properly. To prevent # not updating the list of authorized projects properly. To prevent
# hammering Redis too much we'll wait for a bit between retries. # hammering Redis too much we'll wait for a bit between retries.
sleep(1) sleep(0.1)
end end
begin begin
......
---
title: Reduce time spent waiting for certain Sidekiq jobs to complete
merge_request:
author:
...@@ -14,7 +14,7 @@ module Gitlab ...@@ -14,7 +14,7 @@ module Gitlab
# timeout - The maximum amount of seconds to block the caller for. This # timeout - The maximum amount of seconds to block the caller for. This
# ensures we don't indefinitely block a caller in case a job takes # ensures we don't indefinitely block a caller in case a job takes
# long to process, or is never processed. # long to process, or is never processed.
def wait(timeout = 60) def wait(timeout = 10)
start = Time.current start = Time.current
while (Time.current - start) <= timeout while (Time.current - start) <= timeout
......
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