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

app/services/users/refresh_authorized_projects_service.rb

@@ -34,7 +34,7 @@ module Users
         # 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
         # hammering Redis too much we'll wait for a bit between retries.
-        sleep(1)
+        sleep(0.1)
       end
 
       begin

changelogs/unreleased/reduce-sidekiq-wait-timings.yml

+---
+title: Reduce time spent waiting for certain Sidekiq jobs to complete
+merge_request:
+author:

lib/gitlab/job_waiter.rb

@@ -14,7 +14,7 @@ module Gitlab
     # 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
     #           long to process, or is never processed.
-    def wait(timeout = 60)
+    def wait(timeout = 10)
       start = Time.current
 
       while (Time.current - start) <= timeout