From 2daa8d387bd4dd87f872d0f195d25e67cd199777 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Fri, 14 Sep 2018 17:27:31 +0300 Subject: Remove background job throttling feature We remove this feature as it never worked properly --- ...move_sidekiq_throttling_from_application_settings.rb | 17 +++++++++++++++++ db/schema.rb | 5 +---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 db/post_migrate/20180914201132_remove_sidekiq_throttling_from_application_settings.rb (limited to 'db') diff --git a/db/post_migrate/20180914201132_remove_sidekiq_throttling_from_application_settings.rb b/db/post_migrate/20180914201132_remove_sidekiq_throttling_from_application_settings.rb new file mode 100644 index 00000000000..b3ed0d3f1e9 --- /dev/null +++ b/db/post_migrate/20180914201132_remove_sidekiq_throttling_from_application_settings.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true +# See http://doc.gitlab.com/ce/development/migration_style_guide.html +# for more information on how to write migrations for GitLab. + +class RemoveSidekiqThrottlingFromApplicationSettings < ActiveRecord::Migration + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def change + remove_column :application_settings, :sidekiq_throttling_enabled, :boolean, default: false + remove_column :application_settings, :sidekiq_throttling_queues, :string + remove_column :application_settings, :sidekiq_throttling_factor, :decimal + + Rails.cache.delete("ApplicationSetting:#{Gitlab::VERSION}:#{Rails.version}") + end +end diff --git a/db/schema.rb b/db/schema.rb index b299cde4898..16e3c44513b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20180907015926) do +ActiveRecord::Schema.define(version: 20180914201132) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -119,9 +119,6 @@ ActiveRecord::Schema.define(version: 20180907015926) do t.integer "housekeeping_incremental_repack_period", default: 10, null: false t.integer "housekeeping_full_repack_period", default: 50, null: false t.integer "housekeeping_gc_period", default: 200, null: false - t.boolean "sidekiq_throttling_enabled", default: false - t.string "sidekiq_throttling_queues" - t.decimal "sidekiq_throttling_factor" t.boolean "html_emails_enabled", default: true t.string "plantuml_url" t.boolean "plantuml_enabled" -- cgit v1.2.1