Skip to content
Snippets Groups Projects
Commit 4cc3cd6c authored by James Fargher's avatar James Fargher Committed by GitLab Release Tools Bot
Browse files

Fix backups not working when feature_flags table does not exist

parent 1fdefb34
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -144,7 +144,6 @@ module Backup
def run_restore_task(task_name)
definition = @definitions[task_name]
 
read_backup_information
puts_time "Restoring #{definition.task.human_name} ... ".color(:blue)
 
unless definition.task.enabled
Loading
Loading
@@ -483,7 +482,7 @@ module Backup
end
 
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_storage_concurrency = ENV['GITLAB_BACKUP_MAX_STORAGE_CONCURRENCY'].presence
Backup::GitalyBackup.new(progress, incremental: incremental, max_parallelism: max_concurrency, storage_parallelism: max_storage_concurrency)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment