Remove method to find job artifacts migrated to object storage

The find_registry_differences method returns as unused
registries entries for job artifacts that are in object
storage when the object storage sync is disabled.

The Geo::Secondary::RegistryConsistencyWorker will
perform the cleanup of these unused registries.

ee/app/finders/geo/job_artifact_registry_finder.rb

@@ -79,16 +79,6 @@ module Geo
     alias_method :find_unsynced, :find_never_synced_registries
     # rubocop:enable CodeReuse/ActiveRecord
 
-    # rubocop: disable CodeReuse/ActiveRecord
-    def find_migrated_local(batch_size:, except_ids: [])
-      # all_job_artifacts
-      #   .inner_join_job_artifact_registry
-      #   .with_files_stored_remotely
-      #   .id_not_in(except_ids)
-      #   .limit(batch_size)
-    end
-    # rubocop: enable CodeReuse/ActiveRecord
-
     # rubocop: disable CodeReuse/ActiveRecord
     def find_retryable_failed_registries(batch_size:, except_ids: [])
       syncable

ee/app/workers/geo/migrated_local_files_clean_up_worker.rb

@@ -37,10 +37,7 @@ module Geo
     end
 
     def find_migrated_local_objects(batch_size:)
-      attachment_ids = find_migrated_local_attachments_ids(batch_size: batch_size)
-      job_artifact_ids = find_migrated_local_job_artifacts_ids(batch_size: batch_size)
-
-      take_batch(attachment_ids, job_artifact_ids)
+      find_migrated_local_attachments_ids(batch_size: batch_size)
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
@@ -53,16 +50,6 @@ module Geo
     end
     # rubocop: enable CodeReuse/ActiveRecord
 
-    # rubocop: disable CodeReuse/ActiveRecord
-    def find_migrated_local_job_artifacts_ids(batch_size:)
-      return [] unless job_artifacts_object_store_enabled?
-
-      job_artifacts_finder.find_migrated_local(batch_size: batch_size, except_ids: scheduled_file_ids(:job_artifact))
-                          .pluck(Geo::Fdw::Ci::JobArtifact.arel_table[:id])
-                          .map { |id| ['job_artifact', id] }
-    end
-    # rubocop: enable CodeReuse/ActiveRecord
-
     def scheduled_file_ids(file_types)
       file_types = Array(file_types)
       file_types = file_types.map(&:to_s)
@@ -74,13 +61,8 @@ module Geo
       FileUploader.object_store_enabled?
     end
 
-    def job_artifacts_object_store_enabled?
-      JobArtifactUploader.object_store_enabled?
-    end
-
     def object_store_enabled?
-      attachments_object_store_enabled? ||
-        job_artifacts_object_store_enabled?
+      attachments_object_store_enabled?
     end
 
     def sync_object_storage_enabled?
@@ -90,9 +72,5 @@ module Geo
     def attachments_finder
       @attachments_finder ||= AttachmentRegistryFinder.new(current_node_id: current_node.id)
     end
-
-    def job_artifacts_finder
-      @job_artifacts_finder ||= JobArtifactRegistryFinder.new(current_node_id: current_node.id)
-    end
   end
 end

ee/spec/finders/geo/job_artifact_registry_finder_spec.rb

@@ -329,58 +329,6 @@ RSpec.describe Geo::JobArtifactRegistryFinder, :geo do
     end
   end
 
-  #   describe '#find_migrated_local' do
-  #     before do
-  #       create(:geo_job_artifact_registry, artifact_id: job_artifact_synced_project.id)
-  #       create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_synced_project.id)
-  #       create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_unsynced_project.id)
-  #       create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_broken_storage.id)
-  #     end
-
-  #     it 'returns job artifacts excluding ones from the exception list' do
-  #       job_artifacts = subject.find_migrated_local(batch_size: 10, except_ids: [job_artifact_remote_synced_project.id])
-
-  #       expect(job_artifacts).to match_ids(job_artifact_remote_unsynced_project, job_artifact_remote_broken_storage)
-  #     end
-
-  #     it 'includes synced job artifacts that are expired, exclude stored locally' do
-  #       job_artifacts = subject.find_migrated_local(batch_size: 10)
-
-  #       expect(job_artifacts).to match_ids(job_artifact_remote_synced_project, job_artifact_remote_unsynced_project,
-  #                                          job_artifact_remote_broken_storage)
-  #     end
-
-  #     context 'with selective sync by namespace' do
-  #       let(:secondary) { create(:geo_node, selective_sync_type: 'namespaces', namespaces: [synced_group]) }
-
-  #       it 'returns job artifacts remotely and successfully synced locally' do
-  #         job_artifacts = subject.find_migrated_local(batch_size: 10)
-
-  #         expect(job_artifacts).to match_ids(job_artifact_remote_synced_project)
-  #       end
-  #     end
-
-  #     context 'with selective sync by shard' do
-  #       let(:secondary) { create(:geo_node, selective_sync_type: 'shards', selective_sync_shards: ['broken']) }
-
-  #       it 'returns job artifacts remotely and successfully synced locally' do
-  #         job_artifacts = subject.find_migrated_local(batch_size: 10)
-
-  #         expect(job_artifacts).to match_ids(job_artifact_remote_broken_storage)
-  #       end
-  #     end
-
-  #     context 'with object storage sync disabled' do
-  #       let(:secondary) { create(:geo_node, :local_storage_only) }
-
-  #       it 'returns job artifacts excluding ones from the exception list' do
-  #         job_artifacts = subject.find_migrated_local(batch_size: 10, except_ids: [job_artifact_remote_synced_project.id])
-
-  #         expect(job_artifacts).to match_ids(job_artifact_remote_unsynced_project, job_artifact_remote_broken_storage)
-  #       end
-  #     end
-  #   end
-
   describe '#find_retryable_failed_registries' do
     it 'returns registries for job artifacts that have failed to sync' do
       registry_ci_job_artifact_1 = create(:geo_job_artifact_registry, :failed, artifact_id: ci_job_artifact_1.id)

ee/spec/workers/geo/migrated_local_files_clean_up_worker_spec.rb

@@ -141,61 +141,6 @@ RSpec.describe Geo::MigratedLocalFilesCleanUpWorker, :geo, :geo_fdw, :use_sql_qu
     end
   end
 
-  context 'with job artifacts' do
-    let(:job_artifact_local) { create(:ci_job_artifact) }
-    let(:job_artifact_remote_1) { create(:ci_job_artifact, :remote_store, project: synced_project) }
-
-    before do
-      stub_artifacts_object_storage
-
-      create(:geo_job_artifact_registry, artifact_id: job_artifact_local.id)
-      create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_1.id)
-    end
-
-    it 'schedules worker for artifact stored remotely and synced locally' do
-      expect(Geo::FileRegistryRemovalWorker).to receive(:perform_async).with('job_artifact', job_artifact_remote_1.id)
-      expect(Geo::FileRegistryRemovalWorker).not_to receive(:perform_async).with(anything, job_artifact_local.id)
-
-      subject.perform
-    end
-
-    context 'with selective sync by namespace' do
-      let(:job_artifact_remote_2) { create(:ci_job_artifact, :remote_store, project: project_broken_storage) }
-
-      let(:secondary) { create(:geo_node, :local_storage_only, selective_sync_type: 'shards', selective_sync_shards: ['broken']) }
-
-      before do
-        create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_2.id)
-      end
-
-      it 'schedules worker for artifact stored remotely and synced locally' do
-        expect(Geo::FileRegistryRemovalWorker).to receive(:perform_async).with('job_artifact', job_artifact_remote_2.id)
-        expect(Geo::FileRegistryRemovalWorker).not_to receive(:perform_async).with(anything, job_artifact_remote_1.id)
-        expect(Geo::FileRegistryRemovalWorker).not_to receive(:perform_async).with(anything, job_artifact_local.id)
-
-        subject.perform
-      end
-    end
-
-    context 'with selective sync by shard' do
-      let(:job_artifact_remote_2) { create(:ci_job_artifact, :remote_store, project: unsynced_project) }
-
-      let(:secondary) { create(:geo_node, :local_storage_only, selective_sync_type: 'namespaces', namespaces: [synced_group]) }
-
-      before do
-        create(:geo_job_artifact_registry, artifact_id: job_artifact_remote_2.id)
-      end
-
-      it 'schedules worker for artifact stored remotely and synced locally' do
-        expect(Geo::FileRegistryRemovalWorker).to receive(:perform_async).with('job_artifact', job_artifact_remote_1.id)
-        expect(Geo::FileRegistryRemovalWorker).not_to receive(:perform_async).with(anything, job_artifact_remote_2.id)
-        expect(Geo::FileRegistryRemovalWorker).not_to receive(:perform_async).with(anything, job_artifact_local.id)
-
-        subject.perform
-      end
-    end
-  end
-
   context 'backoff time' do
     let(:cache_key) { "#{described_class.name.underscore}:skip" }