diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-08-31 13:07:14 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-08-31 13:07:14 +0000 |
| commit | 74c53ef6e64299fb6b2030094725a9c0265421f4 (patch) | |
| tree | 8219e2c547d3593b798fcfb231bf74c0ae2001b8 | |
| parent | c691e07a7bafe51322e6a1ea5ec78fdc426d384c (diff) | |
| parent | e951a15cdcb4c5283b5739e39941fef7d728531b (diff) | |
| download | gitlab-ce-74c53ef6e64299fb6b2030094725a9c0265421f4.tar.gz | |
Merge branch 'remove-background-migration-worker-feature-flag' into 'master'
Remove feature flag from BackgroundMigrationWorker
See merge request gitlab-org/gitlab-ce!21404
| -rw-r--r-- | app/workers/background_migration_worker.rb | 14 | ||||
| -rw-r--r-- | changelogs/unreleased/remove-background-migration-worker-feature-flag.yml | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/app/workers/background_migration_worker.rb b/app/workers/background_migration_worker.rb index 7d006cc348e..688b600649a 100644 --- a/app/workers/background_migration_worker.rb +++ b/app/workers/background_migration_worker.rb @@ -10,17 +10,7 @@ class BackgroundMigrationWorker # maintenance related tasks have plenty of time to clean up after a migration # has been performed. def self.minimum_interval - if enable_health_check? - 2.minutes.to_i - else - 5.minutes.to_i - end - end - - def self.enable_health_check? - Rails.env.development? || - Rails.env.test? || - Feature.enabled?('background_migration_health_check') + 2.minutes.to_i end # Performs the background migration. @@ -86,8 +76,6 @@ class BackgroundMigrationWorker # class_name - The name of the background migration that we might want to # run. def healthy_database? - return true unless self.class.enable_health_check? - return true unless Gitlab::Database.postgresql? !Postgresql::ReplicationSlot.lag_too_great? diff --git a/changelogs/unreleased/remove-background-migration-worker-feature-flag.yml b/changelogs/unreleased/remove-background-migration-worker-feature-flag.yml new file mode 100644 index 00000000000..429ab6c59e3 --- /dev/null +++ b/changelogs/unreleased/remove-background-migration-worker-feature-flag.yml @@ -0,0 +1,5 @@ +--- +title: Remove health check feature flag in BackgroundMigrationWorker +merge_request: +author: +type: changed |