Commit a280164f authored by James Fargher's avatar James Fargher

Merge branch 'sh-fix-backup-no-feature-flags-table' into 'master'

Fix backups not working when feature_flags table does not exist

See merge request gitlab-org/gitlab!83101
parents 7025b3f3 e2862180
...@@ -144,7 +144,6 @@ module Backup ...@@ -144,7 +144,6 @@ module Backup
def run_restore_task(task_name) def run_restore_task(task_name)
definition = @definitions[task_name] definition = @definitions[task_name]
read_backup_information
puts_time "Restoring #{definition.task.human_name} ... ".color(:blue) puts_time "Restoring #{definition.task.human_name} ... ".color(:blue)
unless definition.task.enabled unless definition.task.enabled
...@@ -483,7 +482,7 @@ module Backup ...@@ -483,7 +482,7 @@ module Backup
end end
def repository_backup_strategy(incremental) def repository_backup_strategy(incremental)
if Feature.enabled?(:gitaly_backup, default_enabled: :yaml) if !Feature.feature_flags_available? || Feature.enabled?(:gitaly_backup, default_enabled: :yaml)
max_concurrency = ENV['GITLAB_BACKUP_MAX_CONCURRENCY'].presence max_concurrency = ENV['GITLAB_BACKUP_MAX_CONCURRENCY'].presence
max_storage_concurrency = ENV['GITLAB_BACKUP_MAX_STORAGE_CONCURRENCY'].presence max_storage_concurrency = ENV['GITLAB_BACKUP_MAX_STORAGE_CONCURRENCY'].presence
Backup::GitalyBackup.new(progress, incremental: incremental, max_parallelism: max_concurrency, storage_parallelism: max_storage_concurrency) Backup::GitalyBackup.new(progress, incremental: incremental, max_parallelism: max_concurrency, storage_parallelism: max_storage_concurrency)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment