Perform Geo::RepositorySyncService for dirty projects

2 files changed, 6 insertions, 11 deletions

diff --git a/app/models/geo/project_registry.rb b/app/models/geo/project_registry.rb
index 4c1692ba199..575bb813094 100644
--- a/app/models/geo/project_registry.rb
+++ b/app/models/geo/project_registry.rb
@@ -3,6 +3,7 @@ class Geo::ProjectRegistry < Geo::BaseRegistry
 
   validates :project, presence: true
 
+  scope :dirty, -> { where(arel_table[:resync_repository].eq(true).or(arel_table[:resync_wiki].eq(true))) }
   scope :failed, -> { where.not(last_repository_synced_at: nil).where(last_repository_successful_sync_at: nil) }
   scope :synced, -> { where.not(last_repository_synced_at: nil, last_repository_successful_sync_at: nil) }
 end
diff --git a/app/workers/geo_repository_sync_worker.rb b/app/workers/geo_repository_sync_worker.rb
index 870b4238a2e..3ba0a225d50 100644
--- a/app/workers/geo_repository_sync_worker.rb
+++ b/app/workers/geo_repository_sync_worker.rb
@@ -12,7 +12,7 @@ class GeoRepositorySyncWorker
 
     start_time = Time.now
     project_ids_not_synced = find_project_ids_not_synced
-    project_ids_updated_recently = find_synced_project_ids_updated_recently
+    project_ids_updated_recently = find_project_ids_updated_recently
     project_ids = interleave(project_ids_not_synced, project_ids_updated_recently)
 
     logger.info "Started Geo repository syncing for #{project_ids.length} project(s)"
@@ -43,24 +43,18 @@ class GeoRepositorySyncWorker
 
   def find_project_ids_not_synced
     Project.where.not(id: Geo::ProjectRegistry.synced.pluck(:project_id))
+           .order(last_repository_updated_at: :desc)
            .limit(BATCH_SIZE)
            .pluck(:id)
   end
 
-  def find_synced_project_ids_updated_recently
-    Geo::ProjectRegistry.where(project_id: find_project_ids_updated_recently)
-                        .where('last_repository_synced_at <= ?', LAST_SYNC_INTERVAL.ago)
-                        .order(last_repository_synced_at: :asc)
+  def find_project_ids_updated_recently
+    Geo::ProjectRegistry.dirty
+                        .order(Gitlab::Database.nulls_first_order(:last_repository_synced_at, :desc))
                         .limit(BATCH_SIZE)
                         .pluck(:project_id)
   end
 
-  def find_project_ids_updated_recently
-    Project.where(id: Geo::ProjectRegistry.synced.pluck(:project_id))
-           .where('last_repository_updated_at >= ?', LAST_SYNC_INTERVAL.ago)
-           .pluck(:id)
-  end
-
   def interleave(first, second)
     if first.length >= second.length
       first.zip(second)