Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'

Only turn on Sidekiq throttling if column exists If the database has not been migrated properly, the initializer for Sidekiq will fail to start and cause the whole Rails server to crash. This change checks the existence for the column and allows Rails to start even if the setting has not been added as a database column. Closes #24452 See merge request !7446

Merge branch 'sh-fix-sidekiq-throttling-init' into 'master'
4e9b02c3 · Robert Speicher · 0279ad5c · 5a65d9d5 · 4e9b02c3 · 4e9b02c3
Commit 4e9b02c3 authored Nov 14, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

application_setting.rb app/models/application_setting.rb +10 -0

current_settings.rb lib/gitlab/current_settings.rb +1 -1

No files found.
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -203,6 +203,10 @@ class ApplicationSetting < ActiveRecord::Base
    ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
  end

+  def sidekiq_throttling_column_exists?
+    ActiveRecord::Base.connection.column_exists?(:application_settings, :sidekiq_throttling_enabled)
+  end
+
  def domain_whitelist_raw
    self.domain_whitelist.join("\n") unless self.domain_whitelist.nil?
  end
@@ -256,6 +260,12 @@ class ApplicationSetting < ActiveRecord::Base
    ensure_health_check_access_token!
  end

+  def sidekiq_throttling_enabled?
+    return false unless sidekiq_throttling_column_exists?
+
+    sidekiq_throttling_enabled
+  end
+
  private

  def check_repository_storages

--- a/lib/gitlab/current_settings.rb
+++ b/lib/gitlab/current_settings.rb
@@ -24,7 +24,7 @@ module Gitlab
    end

    def sidekiq_throttling_enabled?
-      current_application_settings.sidekiq_throttling_enabled
+      current_application_settings.sidekiq_throttling_enabled?
    end

    def fake_application_settings