Merge branch 'qa-fix-transient-geo-log-cursor-error' into 'master'

Add break clause to log cursor processing

Closes #196044

See merge request gitlab-org/gitlab!24918

ee/lib/gitlab/geo/log_cursor/daemon.rb

@@ -48,7 +48,11 @@ module Gitlab
           # Wrap this with the connection to make it possible to reconnect if
           # PGbouncer dies: https://github.com/rails/rails/issues/29189
           ActiveRecord::Base.connection_pool.with_connection do
-            LogCursor::EventLogs.new.fetch_in_batches { |batch, last_id| handle_events(batch, last_id) }
+            LogCursor::EventLogs.new.fetch_in_batches do |batch, last_id|
+              break if exit?
+
+              handle_events(batch, last_id)
+            end
           end
         end
 

ee/spec/lib/gitlab/geo/log_cursor/daemon_spec.rb

@@ -136,6 +136,15 @@ describe Gitlab::Geo::LogCursor::Daemon, :clean_gitlab_redis_shared_state do
 
         daemon.find_and_handle_events!
       end
+
+      it 'exits when told to stop' do
+        allow_any_instance_of(::Gitlab::Geo::LogCursor::EventLogs).to receive(:fetch_in_batches)
+        allow(daemon).to receive(:exit?).and_return(true)
+
+        expect(daemon).not_to receive(:handle_events)
+
+        daemon.find_and_handle_events!
+      end
     end
 
     context 'when node has namespace restrictions' do