Merge branch...

Merge branch '336437-fix-geo-support-for-artifacts-ci-artifactable-selective_sync_scope-cross-join-dbs' into 'master'

Geo: Fix Ci::Artifactable#replicables_for_current_secondary cross-join DBs

See merge request gitlab-org/gitlab!66703

ee/app/models/concerns/ee/ci/artifactable.rb

@@ -11,21 +11,32 @@ module EE
         def replicables_for_current_secondary(primary_key_in)
           node = ::Gitlab::Geo.current_node
 
-          primary_key_in(primary_key_in)
-            .merge(selective_sync_scope(node))
-            .merge(object_storage_scope(node))
+          replicables =
+            primary_key_in(primary_key_in)
+              .merge(object_storage_scope(node))
+
+          selective_sync_scope(node, replicables)
         end
 
+        # @return [ActiveRecord::Relation<Ci::{Pipeline|Job}PipelineArtifact>] observing object storage settings of the given node
         def object_storage_scope(node)
           return all if node.sync_object_storage?
 
           with_files_stored_locally
         end
 
-        def selective_sync_scope(node)
-          return all unless node.selective_sync?
+        # The primary_key_in in replicables_for_current_secondary method is at most a range of IDs with a maximum of 10_000 records
+        # between them. We can additionally reduce the batch size to 1_000 just for pipeline artifacts and job artifacts if needed.
+        #
+        # @return [ActiveRecord::Relation<Ci::{Pipeline|Job}PipelineArtifact>] observing selective sync settings of the given node
+        def selective_sync_scope(node, replicables)
+          return replicables unless node.selective_sync?
+
+          # Note that we can't do node.projects.ids since it can have millions of records.
+          replicables_project_ids = replicables.distinct.pluck(:project_id)
+          selective_projects_ids  = node.projects.id_in(replicables_project_ids).pluck_primary_key
 
-          project_id_in(node.projects)
+          replicables.project_id_in(selective_projects_ids)
         end
       end
     end