Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 3 deletions

diff --git a/lib/gitlab/runtime.rb b/lib/gitlab/runtime.rb
index 3f6361c7276..bf579dd3b77 100644
--- a/lib/gitlab/runtime.rb
+++ b/lib/gitlab/runtime.rb
@@ -78,12 +78,16 @@ module Gitlab
       end
 
       def max_threads
+        main_thread = 1
+
         if puma?
-          Puma.cli_config.options[:max_threads]
+          Puma.cli_config.options[:max_threads] + main_thread
         elsif sidekiq?
-          Sidekiq.options[:concurrency]
+          # An extra thread for the poller in Sidekiq Cron:
+          # https://github.com/ondrejbartas/sidekiq-cron#under-the-hood
+          Sidekiq.options[:concurrency] + main_thread + 1
         else
-          1
+          main_thread
         end
       end
     end