From e951a15cdcb4c5283b5739e39941fef7d728531b Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Tue, 28 Aug 2018 13:49:16 +0200 Subject: [PATCH] Remove feature flag from BackgroundMigrationWorker The feature has been running on GitLab.com for a while now, without any problems. This commit removes the eature flag, and enables the feature for all users. --- app/workers/background_migration_worker.rb | 14 +------------- ...ve-background-migration-worker-feature-flag.yml | 5 +++++ 2 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 changelogs/unreleased/remove-background-migration-worker-feature-flag.yml 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