Fixes #36563 - Move remove orphan content units to async task

app/lib/actions/katello/orphan_cleanup/remove_orphaned_content_units.rb

@@ -0,0 +1,32 @@
+module Actions
+  module Katello
+    module OrphanCleanup
+      class RemoveOrphanedContentUnits < Actions::Base
+        def plan(options = {})
+          plan_self(id: options[:repo_id], destroy_all: options[:destroy_all])
+        end
+
+        def run
+          content_types_to_index = []
+          if input[:destroy_all]
+            ::Katello::RepositoryTypeManager.enabled_repository_types.each_value do |repo_type|
+              content_types_to_index << repo_type.content_types_to_index
+            end
+          elsif input[:id]
+            repo = ::Katello::Repository.find(input[:id])
+            content_types_to_index = repo.repository_type.content_types_to_index
+          else
+            fail "Pass either a repository to determine content type or destroy_all to destroy all orphaned content units"
+          end
+          content_types_to_index.flatten.each do |type|
+            type.model_class.orphaned.destroy_all
+          end
+        end
+
+        def rescue_strategy
+          Dynflow::Action::Rescue::Skip
+        end
+      end
+    end
+  end
+end

app/lib/actions/katello/repository/index_content.rb

@@ -31,6 +31,10 @@ def run
             output[:new_content][content_type.label] = new_count - initial_counts[content_type.label]
           end
         end
+
+        def finalize
+          ForemanTasks.async_task(OrphanCleanup::RemoveOrphanedContentUnits, {repo_id: input[:id]})
+        end
       end
     end
   end

app/models/katello/concerns/pulp_database_unit.rb

@@ -169,9 +169,9 @@ def with_identifiers(ids)
 
       def orphaned
         if many_repository_associations
-          where.not(:id => repository_association_class.where(:repository_id => ::Katello::Repository.all).select(unit_id_field))
+          where.not(:id => repository_association_class.select(unit_id_field))
         else
-          where.not(:repository_id => ::Katello::Repository.all)
+          where.not(:repository_id => ::Katello::Repository.select(:id))
         end
       end
 

app/models/katello/repository.rb

@@ -935,7 +935,6 @@ def index_content(options = {})
         repository_type.content_types_to_index.each do |type|
           Katello::Logging.time("CONTENT_INDEX", data: {type: type.model_class}) do
             Katello::ContentUnitIndexer.new(content_type: type, repository: self, optimized: !full_index).import_all
-            type.model_class.orphaned.destroy_all
           end
         end
         repository_type.index_additional_data_proc&.call(self)

test/models/repository_test.rb

@@ -715,7 +715,7 @@ def test_index_content_destroys_orphans
       ::Katello::ContentUnitIndexer.any_instance.stubs(:import_all).returns(true)
       ::Katello::Repository.any_instance.stubs(:import_distribution_data).returns(true)
       rpm.repository_rpms.destroy_all
-      @rhel6.index_content
+      ForemanTasks.sync_task(Actions::Katello::OrphanCleanup::RemoveOrphanedContentUnits, {repo_id: @rhel6.id})
       assert_raises(ActiveRecord::RecordNotFound) { rpm.reload }
     end