diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-02-06 19:24:46 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-02-06 19:24:46 +0000 |
| commit | c25ac43276a2787152f2194a845f695c628a03d3 (patch) | |
| tree | 582e4bd024d19456103789f9bb4ec0c38663fb96 /config | |
| parent | c495e5f17c6b894f43bc409e78cd97fc89fd077c (diff) | |
| parent | f116f87c91d9d65f570c98071f6aa9506300f766 (diff) | |
| download | gitlab-ce-c25ac43276a2787152f2194a845f695c628a03d3.tar.gz | |
Merge branch 'remove-sidekiq-backup-ar-threads' into 'master'
Don't use backup AR connections for Sidekiq
Closes #27713
See merge request !9001
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index fa318384405..0c4516b70f0 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -36,11 +36,9 @@ Sidekiq.configure_server do |config| Gitlab::SidekiqThrottler.execute! - # Database pool should be at least `sidekiq_concurrency` + 2 - # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md config = ActiveRecord::Base.configurations[Rails.env] || Rails.application.config.database_configuration[Rails.env] - config['pool'] = Sidekiq.options[:concurrency] + 2 + config['pool'] = Sidekiq.options[:concurrency] ActiveRecord::Base.establish_connection(config) Rails.logger.debug("Connection Pool size for Sidekiq Server is now: #{ActiveRecord::Base.connection.pool.instance_variable_get('@size')}") |