Merge branch 'only-limit-fetch-when-requested' into 'master'

Only require sidekiq-limit_fetch when enabled in settings

Closes #36253

See merge request !13715

Gemfile

@@ -154,7 +154,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'

app/views/admin/application_settings/_form.html.haml

@@ -356,7 +356,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

changelogs/unreleased/only-limit-fetch-when-requested.yml

+---
+title: Only require Sidekiq throttling library when enabled, to reduce cache misses
+merge_request:
+author:
+type: fixed

lib/gitlab/sidekiq_throttler.rb

@@ -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

spec/lib/gitlab/sidekiq_throttler_spec.rb

 require 'spec_helper'
 
 describe Gitlab::SidekiqThrottler do
+  describe '#execute!' do
+    context 'when job throttling is enabled' do
       before do
         Sidekiq.options[:concurrency] = 35
 
@@ -11,7 +13,12 @@ describe Gitlab::SidekiqThrottler do
         )
       end
 
-  describe '#execute!' do
+      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!
 
@@ -25,4 +32,13 @@ describe Gitlab::SidekiqThrottler do
         expect(Sidekiq::Queue['merge'].limit).to be_nil
       end
     end
+
+    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')
+
+        described_class.execute!
+      end
+    end
+  end
 end