summaryrefslogtreecommitdiff
path: root/lib/backup/repositories.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/backup/repositories.rb')
-rw-r--r--lib/backup/repositories.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/backup/repositories.rb b/lib/backup/repositories.rb
index 80d23c1eb7f..0b5a62529b4 100644
--- a/lib/backup/repositories.rb
+++ b/lib/backup/repositories.rb
@@ -12,7 +12,10 @@ module Backup
def dump(max_concurrency:, max_storage_concurrency:)
strategy.start(:create)
- if max_concurrency <= 1 && max_storage_concurrency <= 1
+ # gitaly-backup is designed to handle concurrency on its own. So we want
+ # to avoid entering the buggy concurrency code here when gitaly-backup
+ # is enabled.
+ if (max_concurrency <= 1 && max_storage_concurrency <= 1) || !strategy.parallel_enqueue?
return enqueue_consecutive
end