From 0c872e02b2c822e3397515ec324051ff540f0cd5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 20 Dec 2022 14:22:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-7-stable-ee --- sidekiq_cluster/sidekiq_cluster.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'sidekiq_cluster/sidekiq_cluster.rb') diff --git a/sidekiq_cluster/sidekiq_cluster.rb b/sidekiq_cluster/sidekiq_cluster.rb index c68cbe7c163..1ed08e7e839 100644 --- a/sidekiq_cluster/sidekiq_cluster.rb +++ b/sidekiq_cluster/sidekiq_cluster.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require_relative '../lib/gitlab/process_management' +require_relative '../lib/gitlab/process_supervisor' module Gitlab module SidekiqCluster @@ -33,8 +34,9 @@ module Gitlab # # directory - The directory of the Rails application. # - # Returns an Array containing the PIDs of the started processes. - def self.start(queues, env: :development, directory: Dir.pwd, max_concurrency: 50, min_concurrency: 0, timeout: DEFAULT_SOFT_TIMEOUT_SECONDS, dryrun: false) + # Returns an Array containing the waiter threads (from Process.detach) of + # the started processes. + def self.start(queues, env: :development, directory: Dir.pwd, max_concurrency: 20, min_concurrency: 0, timeout: DEFAULT_SOFT_TIMEOUT_SECONDS, dryrun: false) queues.map.with_index do |pair, index| start_sidekiq(pair, env: env, directory: directory, @@ -82,9 +84,7 @@ module Gitlab ) end - ProcessManagement.wait_async(pid) - - pid + Process.detach(pid) end def self.count_by_queue(queues) -- cgit v1.2.3