Merge branch '29536-apply-bfg-object-map-might-fail-due-to-race-condition' into 'master'

Resolve "Apply BFG Object map might fail due to race condition"

See merge request gitlab-org/gitlab!38686

app/services/projects/cleanup_service.rb

@@ -22,7 +22,7 @@ module Projects
       apply_bfg_object_map!
 
       # Remove older objects that are no longer referenced
-      GitGarbageCollectWorker.new.perform(project.id, :gc)
+      GitGarbageCollectWorker.new.perform(project.id, :gc, "project_cleanup:gc:#{project.id}")
 
       # The cache may now be inaccurate, and holding onto it could prevent
       # bugs assuming the presence of some object from manifesting for some

app/workers/git_garbage_collect_worker.rb

@@ -11,6 +11,7 @@ class GitGarbageCollectWorker # rubocop:disable Scalability/IdempotentWorker
   LEASE_TIMEOUT = 86400
 
   def perform(project_id, task = :gc, lease_key = nil, lease_uuid = nil)
+    lease_key ||= "git_gc:#{task}:#{project_id}"
     project = Project.find(project_id)
     active_uuid = get_lease_uuid(lease_key)
 

spec/services/projects/cleanup_service_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Projects::CleanupService do
 
     it 'runs garbage collection on the repository' do
       expect_next_instance_of(GitGarbageCollectWorker) do |worker|
-        expect(worker).to receive(:perform)
+        expect(worker).to receive(:perform).with(project.id, :gc, "project_cleanup:gc:#{project.id}")
       end
 
       service.execute

spec/workers/git_garbage_collect_worker_spec.rb

@@ -95,6 +95,7 @@ RSpec.describe GitGarbageCollectWorker do
         it_behaves_like 'it updates the project statistics'
 
         it "flushes ref caches when the task if 'gc'" do
+          expect(subject).to receive(:get_lease_uuid).with("git_gc:#{task}:#{project.id}").and_return(false)
           expect_any_instance_of(Repository).to receive(:after_create_branch).and_call_original
           expect_any_instance_of(Repository).to receive(:branch_names).and_call_original
           expect_any_instance_of(Repository).to receive(:has_visible_content?).and_call_original