Merge branch '37324-fix-statement-timeout-while-finding-projects-to-reverify' into 'master'

Geo - Optimize the query to return reverifiable projects on Geo primary node

See merge request gitlab-org/gitlab!38732

ee/app/finders/geo/repository_verification_finder.rb

@@ -126,15 +126,21 @@ module Geo
         repository_state_table["last_#{type}_verification_ran_at"].eq(nil).or(
           repository_state_table["last_#{type}_verification_ran_at"].lteq(interval))
 
-      # We should prioritize less active projects first because high active
-      # projects have their repositories verified more frequently.
       query =
-        Project.joins(:repository_state)
+        projects_table
+          .join(repository_state_table).on(project_id_matcher)
+          .project(projects_table[:id], projects_table[:last_repository_updated_at])
           .where(verification_succeded.and(verified_before_interval))
-          .order(last_repository_updated_at_asc)
-          .limit(batch_size)
+          .take(batch_size)
 
-      apply_shard_restriction(query)
+      query = apply_shard_restriction(query)
+      cte = Gitlab::SQL::CTE.new(:reverifiable_projects, query)
+
+      # We should prioritize less active projects first because high active
+      # projects have their repositories verified more frequently.
+      Project.with(cte.to_arel)
+             .from(cte.alias_to(projects_table))
+             .order(last_repository_updated_at_asc)
     end
     # rubocop: enable CodeReuse/ActiveRecord
 

ee/changelogs/unreleased/37324-fix-statement-timeout-while-finding-projects-to-reverify.yml

+---
+title: Geo - Optimize the query to return reverifiable projects on Geo primary node
+merge_request: 38732
+author:
+type: performance