Merge branch 'capture-ci-minutes-reset-errors' into 'master'

Capture errors raised for a batch when resetting CI minutes

See merge request gitlab-org/gitlab!41888

ee/app/services/ci/minutes/batch_reset_service.rb

@@ -35,8 +35,8 @@ module Ci
           reset_shared_runners_seconds!(namespaces)
           reset_ci_minutes_notifications!(namespaces)
         end
-      rescue ActiveRecord::ActiveRecordError
-        @errors << { count: namespaces.size, first_id: namespaces.first.id, last_id: namespaces.last.id }
+      rescue ActiveRecord::ActiveRecordError => e
+        @errors << { count: namespaces.size, first_id: namespaces.first.id, last_id: namespaces.last.id, error: e.message }
       end
 
       # This service is responsible for the logic that recalculates the extra shared runners

ee/app/workers/ci/batch_reset_minutes_worker.rb

@@ -4,6 +4,7 @@ module Ci
   class BatchResetMinutesWorker
     include ApplicationWorker
 
+    sidekiq_options retry: 10
     feature_category :continuous_integration
     idempotent!
 

ee/spec/services/ci/minutes/batch_reset_service_spec.rb

@@ -138,7 +138,7 @@ RSpec.describe Ci::Minutes::BatchResetService do
         let(:ids_range) { nil }
 
         before do
-          expect(Namespace).to receive(:transaction).once.ordered.and_raise(ActiveRecord::ActiveRecordError)
+          expect(Namespace).to receive(:transaction).once.ordered.and_raise(ActiveRecord::ActiveRecordError, 'something went wrong')
           expect(Namespace).to receive(:transaction).once.ordered.and_call_original
         end
 
@@ -157,7 +157,7 @@ RSpec.describe Ci::Minutes::BatchResetService do
             Ci::Minutes::BatchResetService::BatchNotResetError.new(
               'Some namespace shared runner minutes were not reset.'
             ),
-            { namespace_ranges: [{ count: 3, first_id: 1, last_id: 3 }] }
+            { namespace_ranges: [{ count: 3, first_id: 1, last_id: 3, error: 'something went wrong' }] }
           ).once.and_call_original
 
           expect { subject }.to raise_error(Ci::Minutes::BatchResetService::BatchNotResetError)