Fixes #33924 - use new pulp orphans api

adds a new setting to control cleanup time
Katello · Nov 30, 2021 · fca6588 · fca6588
1 parent 861d765
commit fca6588
Show file tree

Hide file tree

Showing 16 changed files with 3,560 additions and 4,797 deletions.
diff --git a/app/models/setting/content.rb b/app/models/setting/content.rb
@@ -154,7 +154,8 @@ def self.default_settings
       self.set('bulk_load_size', N_('The number of items fetched from a single paged Pulp API call.'), 2000,
                N_('Pulp bulk load size')),
       self.set('upload_profiles_without_dynflow', N_('Allow Katello to update host installed packages, enabled repos, and module inventory directly instead of wrapped in Dynflow tasks (try turning off if Puma processes are using too much memory)'), true,
-               N_('Upload profiles without Dynflow'))
+               N_('Upload profiles without Dynflow')),
+      self.set('orphan_protection_time', N_('Time in minutes to consider orphan content as orphaned.'), 1440, N_('Orphaned Content Protection Time'))
     ]
   end
 

diff --git a/app/services/katello/pulp3/api/core.rb b/app/services/katello/pulp3/api/core.rb
@@ -102,7 +102,7 @@ def import_api
         end
 
         def orphans_api
-          PulpcoreClient::OrphansApi.new(core_api_client)
+          PulpcoreClient::OrphansCleanupApi.new(core_api_client)
         end
 
         def artifacts_api
@@ -152,7 +152,7 @@ def ignore_404_exception(*)
         end
 
         def delete_orphans
-          [orphans_api.delete]
+          [orphans_api.cleanup(PulpcoreClient::OrphansCleanup.new(orphan_protection_time: Setting[:orphan_protection_time]))]
         end
 
         def delete_remote(remote_href)