Commit 9788d99b authored by James Fargher's avatar James Fargher

Merge branch 'sh-fix-issue-241251' into 'master'

Fix exception handling when a concurrent backup fails

See merge request gitlab-org/gitlab!40451
parents 642c4dbd 9f985393
---
title: Fix exception handling when a concurrent backup fails
merge_request: 40451
author:
type: fixed
...@@ -182,12 +182,12 @@ module Backup ...@@ -182,12 +182,12 @@ module Backup
queue.push(project) queue.push(project)
end end
raise errors.pop unless errors.empty?
ensure
queue.close queue.close
ActiveSupport::Dependencies.interlock.permit_concurrent_loads do ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
threads.each(&:join) threads.each(&:join)
end end
raise errors.pop unless errors.empty?
end end
def dump_project(project) def dump_project(project)
......
...@@ -19,7 +19,7 @@ RSpec.describe Backup::Repository do ...@@ -19,7 +19,7 @@ RSpec.describe Backup::Repository do
end end
end end
describe '#dump', quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/241251' do describe '#dump' do
before do before do
allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(storage_keys) allow(Gitlab.config.repositories.storages).to receive(:keys).and_return(storage_keys)
end end
......
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