Merge branch 'only-limit-fetch-when-requested' into 'master'
Only require sidekiq-limit_fetch when enabled in settings Closes #36253 See merge request !13715
This commit is contained in:
commit
367d3d9704
5 changed files with 44 additions and 19 deletions
2
Gemfile
2
Gemfile
|
@ -152,7 +152,7 @@ gem 'acts-as-taggable-on', '~> 4.0'
|
|||
gem 'sidekiq', '~> 5.0'
|
||||
gem 'sidekiq-cron', '~> 0.6.0'
|
||||
gem 'redis-namespace', '~> 1.5.2'
|
||||
gem 'sidekiq-limit_fetch', '~> 3.4'
|
||||
gem 'sidekiq-limit_fetch', '~> 3.4', require: false
|
||||
|
||||
# Cron Parser
|
||||
gem 'rufus-scheduler', '~> 3.4'
|
||||
|
|
|
@ -362,7 +362,9 @@
|
|||
%fieldset
|
||||
%legend Background Jobs
|
||||
%p
|
||||
These settings require a restart to take effect.
|
||||
These settings require a
|
||||
= link_to 'restart', help_page_path('administration/restart_gitlab')
|
||||
to take effect.
|
||||
.form-group
|
||||
.col-sm-offset-2.col-sm-10
|
||||
.checkbox
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Only require Sidekiq throttling library when enabled, to reduce cache misses
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -3,6 +3,8 @@ module Gitlab
|
|||
class << self
|
||||
def execute!
|
||||
if Gitlab::CurrentSettings.sidekiq_throttling_enabled?
|
||||
require 'sidekiq-limit_fetch'
|
||||
|
||||
Gitlab::CurrentSettings.current_application_settings.sidekiq_throttling_queues.each do |queue|
|
||||
Sidekiq::Queue[queue].limit = queue_limit
|
||||
end
|
||||
|
|
|
@ -1,28 +1,44 @@
|
|||
require 'spec_helper'
|
||||
|
||||
describe Gitlab::SidekiqThrottler do
|
||||
before do
|
||||
Sidekiq.options[:concurrency] = 35
|
||||
|
||||
stub_application_setting(
|
||||
sidekiq_throttling_enabled: true,
|
||||
sidekiq_throttling_factor: 0.1,
|
||||
sidekiq_throttling_queues: %w[build project_cache]
|
||||
)
|
||||
end
|
||||
|
||||
describe '#execute!' do
|
||||
it 'sets limits on the selected queues' do
|
||||
described_class.execute!
|
||||
context 'when job throttling is enabled' do
|
||||
before do
|
||||
Sidekiq.options[:concurrency] = 35
|
||||
|
||||
expect(Sidekiq::Queue['build'].limit).to eq 4
|
||||
expect(Sidekiq::Queue['project_cache'].limit).to eq 4
|
||||
stub_application_setting(
|
||||
sidekiq_throttling_enabled: true,
|
||||
sidekiq_throttling_factor: 0.1,
|
||||
sidekiq_throttling_queues: %w[build project_cache]
|
||||
)
|
||||
end
|
||||
|
||||
it 'requires sidekiq-limit_fetch' do
|
||||
expect(described_class).to receive(:require).with('sidekiq-limit_fetch').and_call_original
|
||||
|
||||
described_class.execute!
|
||||
end
|
||||
|
||||
it 'sets limits on the selected queues' do
|
||||
described_class.execute!
|
||||
|
||||
expect(Sidekiq::Queue['build'].limit).to eq 4
|
||||
expect(Sidekiq::Queue['project_cache'].limit).to eq 4
|
||||
end
|
||||
|
||||
it 'does not set limits on other queues' do
|
||||
described_class.execute!
|
||||
|
||||
expect(Sidekiq::Queue['merge'].limit).to be_nil
|
||||
end
|
||||
end
|
||||
|
||||
it 'does not set limits on other queues' do
|
||||
described_class.execute!
|
||||
context 'when job throttling is disabled' do
|
||||
it 'does not require sidekiq-limit_fetch' do
|
||||
expect(described_class).not_to receive(:require).with('sidekiq-limit_fetch')
|
||||
|
||||
expect(Sidekiq::Queue['merge'].limit).to be_nil
|
||||
described_class.execute!
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue