kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'remove-background-migration-worker-feature-flag' into 'master'

Browse source 
Remove feature flag from BackgroundMigrationWorker

See merge request gitlab-org/gitlab-ce!21404
This commit is contained in:
Douwe Maan 2018-08-31 13:07:14 +00:00
commit 74c53ef6e6
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/workers/background_migration_worker.rb
View file

@ -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?

5
changelogs/unreleased/remove-background-migration-worker-feature-flag.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Remove health check feature flag in BackgroundMigrationWorker
merge_request:
author:
type: changed