Merge branch 'ensure-stuck-builds-lease-cancel' into 'master'

Ensure lease cancellation in StuckCiJobsWorker

See merge request gitlab-org/gitlab!71519

app/workers/stuck_ci_jobs_worker.rb

@@ -21,9 +21,11 @@ class StuckCiJobsWorker # rubocop:disable Scalability/IdempotentWorker
 
     return unless try_obtain_lease
 
-    Ci::StuckBuilds::DropService.new.execute
-
-    remove_lease
+    begin
+      Ci::StuckBuilds::DropService.new.execute
+    ensure
+      remove_lease
+    end
   end
 
   private

spec/workers/ci/stuck_builds/drop_running_worker_spec.rb

@@ -57,7 +57,7 @@ RSpec.describe Ci::StuckBuilds::DropRunningWorker do
           expect_to_cancel_exclusive_lease(worker_lease_key, worker_lease_uuid)
 
           allow_next_instance_of(Ci::StuckBuilds::DropRunningService) do |service|
-            allow(service).to receive(:execute) do
+            expect(service).to receive(:execute) do
               raise 'The query timed out'
             end
           end

spec/workers/stuck_ci_jobs_worker_spec.rb

@@ -55,6 +55,20 @@ RSpec.describe StuckCiJobsWorker do
 
         worker.perform
       end
+
+      context 'when the DropService fails' do
+        it 'ensures cancellation of the exclusive lease' do
+          expect_to_cancel_exclusive_lease(worker_lease_key, worker_lease_uuid)
+
+          allow_next_instance_of(Ci::StuckBuilds::DropService) do |service|
+            expect(service).to receive(:execute) do
+              raise 'The query timed out'
+            end
+          end
+
+          expect { worker.perform }.to raise_error(/The query timed out/)
+        end
+      end
     end
   end
 end