diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-11-11 18:32:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-11-11 18:32:40 +0000 |
| commit | 0e1e42885a792145dafc6aa28165d069b1cb5c03 (patch) | |
| tree | 2748dddbf1f499ff9be1eca4ce6a8132f44649a1 /db/schema.rb | |
| parent | 52f29501be343ed8cb8bfc8ee64014cd3f4c9ba4 (diff) | |
| parent | e840749b84ceb226e46ebdfb489c735e3370cff7 (diff) | |
| download | gitlab-ce-0e1e42885a792145dafc6aa28165d069b1cb5c03.tar.gz | |
Merge branch 'sidekiq-job-throttling' into 'master'
Allow certain Sidekiq jobs to be throttled
## What does this MR do?
Allows certain slow running Sidekiq jobs to be throttled. It is disabled by default and can be enabled via the Application Settings.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
## What are the relevant issue numbers?
Related to #23352
See merge request !7292
Diffstat (limited to 'db/schema.rb')
| -rw-r--r-- | db/schema.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/db/schema.rb b/db/schema.rb index 64d744d8268..3efb884c113 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -98,6 +98,9 @@ ActiveRecord::Schema.define(version: 20161109150329) do t.text "help_page_text_html" t.text "shared_runners_text_html" t.text "after_sign_up_text_html" + t.boolean "sidekiq_throttling_enabled", default: false + t.string "sidekiq_throttling_queues" + t.decimal "sidekiq_throttling_factor" t.boolean "housekeeping_enabled", default: true, null: false t.boolean "housekeeping_bitmaps_enabled", default: true, null: false t.integer "housekeeping_incremental_repack_period", default: 10, null: false |