diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 11:08:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-23 11:08:56 +0000 |
| commit | 60e912453247fce53f0ed975f675b9f48bcfb54f (patch) | |
| tree | 894e0048bee8bb5c065a8c0ac0eaa640dc667d70 /lib | |
| parent | 77d81d7c756bf5b9e4f25aea294973b0d3b550da (diff) | |
| download | gitlab-ce-60e912453247fce53f0ed975f675b9f48bcfb54f.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-9-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/backup/manager.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 6e90824fce2..cb5fd959bc9 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -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 @@ -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) |