Refactor legacy finder to find registries where sync has failed

These changes use the new finder when FDW is enabled without selective
sync to avoid code duplication.

ee/app/finders/geo/legacy_project_registry_sync_failed_finder.rb

@@ -2,7 +2,7 @@
 
 # Finder for retrieving project registries that synchronization have
 # failed scoped to a type (repository or wiki) using cross-database
-# joins for selective sync.
+# joins.
 #
 # Basic usage:
 #
@@ -22,30 +22,16 @@ module Geo
     end
 
     def execute
-      if selective_sync?
-        failed_registries_for_selective_sync
-      else
-        failed_registries
-      end
-    end
-
-    private
-
-    attr_reader :type
-
-    def failed_registries
-      Geo::ProjectRegistry.sync_failed(type)
-    end
-
-    # rubocop: disable CodeReuse/ActiveRecord
-    def failed_registries_for_selective_sync
       legacy_inner_join_registry_ids(
-        failed_registries,
-        current_node.projects.pluck(:id),
+        Geo::ProjectRegistry.sync_failed(type),
+        current_node.projects.pluck_primary_key,
         Geo::ProjectRegistry,
         foreign_key: :project_id
       )
     end
-    # rubocop: enable CodeReuse/ActiveRecord
+
+    private
+
+    attr_reader :type
   end
 end

ee/app/finders/geo/project_registry_finder.rb

@@ -182,10 +182,10 @@ module Geo
     end
 
     def finder_klass_for_failed_registries
-      if Gitlab::Geo::Fdw.enabled_for_selective_sync?
-        Geo::ProjectRegistrySyncFailedFinder
-      else
+      if !Gitlab::Geo::Fdw.enabled? || use_legacy_queries_for_selective_sync?
         Geo::LegacyProjectRegistrySyncFailedFinder
+      else
+        Geo::ProjectRegistrySyncFailedFinder
       end
     end
 

ee/spec/finders/geo/legacy_project_registry_sync_failed_finder_spec.rb

@@ -22,102 +22,86 @@ describe Geo::LegacyProjectRegistrySyncFailedFinder, :geo do
     let!(:registry_repository_failed_broken_shard) { create(:geo_project_registry, :synced, :repository_sync_failed, project: project_5) }
     let!(:registry_synced) { create(:geo_project_registry, :synced) }
 
-    shared_examples 'finds failed registries' do
-      context 'with repository type' do
-        subject { described_class.new(current_node: node, type: :repository) }
-
-        context 'without selective sync' do
-          it 'returns all failed registries' do
-            expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_repository_failed_broken_shard])
-          end
-        end
+    before do
+      stub_fdw_disabled
+    end
 
-        context 'with selective sync by namespace' do
-          it 'returns failed registries where projects belongs to the namespaces' do
-            node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
+    context 'with repository type' do
+      subject { described_class.new(current_node: node, type: :repository) }
 
-            expect(subject.execute).to match_array([registry_failed, registry_repository_failed])
-          end
+      context 'without selective sync' do
+        it 'returns all failed registries' do
+          expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_repository_failed_broken_shard])
         end
+      end
 
-        context 'with selective sync by shard' do
-          it 'returns failed registries where projects belongs to the shards' do
-            node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
+      context 'with selective sync by namespace' do
+        it 'returns failed registries where projects belongs to the namespaces' do
+          node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
 
-            expect(subject.execute).to match_array([registry_repository_failed_broken_shard])
-          end
+          expect(subject.execute).to match_array([registry_failed, registry_repository_failed])
         end
       end
 
-      context 'with wiki type' do
-        subject { described_class.new(current_node: node, type: :wiki) }
+      context 'with selective sync by shard' do
+        it 'returns failed registries where projects belongs to the shards' do
+          node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
 
-        context 'without selective sync' do
-          it 'returns all failed registries' do
-            expect(subject.execute).to match_array([registry_failed, registry_wiki_failed, registry_wiki_failed_broken_shard])
-          end
+          expect(subject.execute).to match_array([registry_repository_failed_broken_shard])
         end
+      end
+    end
 
-        context 'with selective sync by namespace' do
-          it 'returns failed registries where projects belongs to the namespaces' do
-            node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
+    context 'with wiki type' do
+      subject { described_class.new(current_node: node, type: :wiki) }
 
-            expect(subject.execute).to match_array([registry_failed, registry_wiki_failed])
-          end
+      context 'without selective sync' do
+        it 'returns all failed registries' do
+          expect(subject.execute).to match_array([registry_failed, registry_wiki_failed, registry_wiki_failed_broken_shard])
         end
+      end
 
-        context 'with selective sync by shard' do
-          it 'returns failed registries where projects belongs to the shards' do
-            node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
+      context 'with selective sync by namespace' do
+        it 'returns failed registries where projects belongs to the namespaces' do
+          node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
 
-            expect(subject.execute).to match_array([registry_wiki_failed_broken_shard])
-          end
+          expect(subject.execute).to match_array([registry_failed, registry_wiki_failed])
         end
       end
 
-      context 'with no type' do
-        subject { described_class.new(current_node: node, type: :invalid) }
+      context 'with selective sync by shard' do
+        it 'returns failed registries where projects belongs to the shards' do
+          node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
 
-        context 'without selective sync' do
-          it 'returns all failed registries' do
-            expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_wiki_failed, registry_repository_failed_broken_shard, registry_wiki_failed_broken_shard])
-          end
+          expect(subject.execute).to match_array([registry_wiki_failed_broken_shard])
         end
+      end
+    end
 
-        context 'with selective sync by namespace' do
-          it 'returns all failed registries where projects belongs to the namespaces' do
-            node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
+    context 'with no type' do
+      subject { described_class.new(current_node: node, type: :invalid) }
 
-            expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_wiki_failed])
-          end
+      context 'without selective sync' do
+        it 'returns all failed registries' do
+          expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_wiki_failed, registry_repository_failed_broken_shard, registry_wiki_failed_broken_shard])
         end
+      end
 
-        context 'with selective sync by shard' do
-          it 'returns all failed registries where projects belongs to the shards' do
-            node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
+      context 'with selective sync by namespace' do
+        it 'returns all failed registries where projects belongs to the namespaces' do
+          node.update!(selective_sync_type: 'namespaces', namespaces: [group_1, nested_group_1])
 
-            expect(subject.execute).to match_array([registry_repository_failed_broken_shard, registry_wiki_failed_broken_shard])
-          end
+          expect(subject.execute).to match_array([registry_failed, registry_repository_failed, registry_wiki_failed])
         end
       end
-    end
 
-    # Disable transactions via :delete method because a foreign table
-    # can't see changes inside a transaction of a different connection.
-    context 'FDW', :delete do
-      before do
-        skip('FDW is not configured') unless Gitlab::Geo::Fdw.enabled?
-      end
+      context 'with selective sync by shard' do
+        it 'returns all failed registries where projects belongs to the shards' do
+          node.update!(selective_sync_type: 'shards', selective_sync_shards: ['broken'])
 
-      include_examples 'finds failed registries'
-    end
-
-    context 'Legacy' do
-      before do
-        stub_fdw_disabled
+          expect(subject.execute).to match_array([registry_repository_failed_broken_shard, registry_wiki_failed_broken_shard])
+        end
       end
-
-      include_examples 'finds failed registries'
     end
   end
 end