foreman_maintain 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f8cd453e8f9b19bec3b8912f8c88c0bfe4d20c08268c42c77b3748a9b0ebcf
-  data.tar.gz: 8c1f5fcbba0d7c94e349290ee5b21e313435dc1ad55ab2c782b216b393481cb4
+  metadata.gz: 58a7f9214ba787d4da524da11a36469573b52b25859ee6a1efa74502c98504a2
+  data.tar.gz: 8e5818b8ce279babe6a6cda10d8549ebe2c07eb5c5f651c2f8dab2b1ed6b4b93
 SHA512:
-  metadata.gz: f2572cdbd94ca61bf489eb1ad9354125fe4993c5d448ba0804aaa211cb17559c0ea307c96d63b56ed1dfa76649ebfa3750b7778ca7e95e57758bd454931613fa
-  data.tar.gz: c31975cb3a4f4d27361b20834329262eef2409d73e65c29ead3207fa27d14288b37864c919cb9cb229f7760d95b09714a3ffe605d0cd73f09dffb6fb4f458508
+  metadata.gz: 5b8356b678fb0335b5df23205cbc328afadc8ba33d27501d9b655301c025a4edbe4385a7ecc96d2e2ba70aecb313ce298086046a56e7053ff62b24cc8d9aaad8
+  data.tar.gz: 3cd2e0ca9b5a23b1e3de9f27faf2a86ee82399310786ee016e54d4f55cfbd87aab9ae250afdee9193df30254049e7edc893992362bbf5a0975128ee8345e11cc

data/definitions/features/pulp2.rb

@@ -34,4 +34,10 @@ class Features::Pulp < ForemanMaintain::Feature
       '/etc/default/pulp_workers'
     ]
   end
+
+  def exclude_from_backup
+    # Exclude /var/lib/pulp/katello-export and /var/lib/pulp/cache
+    # since the tar is run from /var/lib/pulp, list subdir paths only
+    ['katello-export', 'cache']
+  end
 end

data/definitions/features/service.rb

@@ -137,7 +137,7 @@ class Features::Service < ForemanMaintain::Feature
 
   def filter_disabled_services!(action, service_list)
     if %w[start stop restart status].include?(action)
-      service_list.select!(&:enabled?)
+      service_list.select! { |service| !service.respond_to?(:enabled?) || service.enabled? }
     end
     service_list
   end

data/definitions/procedures/backup/pulp.rb

@@ -30,7 +30,7 @@ module Procedures::Backup
       feature(:tar).run(
         :archive => File.join(@backup_dir, 'pulp_data.tar'),
         :command => 'create',
-        :exclude => ['var/lib/pulp/katello-export'],
+        :exclude => feature(:pulp2).exclude_from_backup,
         :listed_incremental => File.join(@backup_dir, '.pulp.snar'),
         :transform => 's,^,var/lib/pulp/,S',
         :volume_size => @tar_volume_size,

data/definitions/procedures/pulp/cleanup_old_metadata_files.rb

@@ -0,0 +1,75 @@
+require 'find'
+require 'rexml/document'
+
+module Procedures::Pulp
+  class CleanupOldMetadataFiles < ForemanMaintain::Procedure
+    metadata do
+      description 'Cleanup old and unneeded yum metadata files from /var/lib/pulp/'
+      confine do
+        check_max_version('katello-common', '4.0')
+      end
+      param :remove_files, 'If true, will actually delete files, otherwise will print them out.'
+    end
+
+    PULP_METADATA_DIR = '/var/lib/pulp/published/yum/master/yum_distributor/'.freeze
+    REPOMD_FILE = 'repomd.xml'.freeze
+
+    def run
+      return unless File.directory?(PULP_METADATA_DIR)
+      found = []
+
+      puts 'Warning: This command may cause reduced performance related to content operations.'
+      message = 'Locating repository metadata (this may take a while)'
+      with_spinner(message) do |spinner|
+        Find.find(PULP_METADATA_DIR) do |path|
+          next if File.basename(path) != REPOMD_FILE
+          found << path
+          spinner.update("#{message}: Found #{found.count} repos.")
+        end
+      end
+
+      found.each do |repo_md_path|
+        handle(repo_md_path, @remove_files)
+      end
+    end
+
+    def handle(repo_md_path, remove_files)
+      base_path = File.dirname(repo_md_path)
+      to_remove = list_existing_files(repo_md_path) - list_repomd_files(repo_md_path)
+
+      if to_remove.empty?
+        "Skipping #{base_path}, no files to remove."
+      elsif remove_files
+        puts '================================================================================'
+        puts "Removing #{to_remove.count} files from #{base_path}"
+        to_remove.each { |file| File.delete(File.join(base_path, file)) }
+      else
+        puts '================================================================================'
+        puts "For #{base_path} would remove, but --remove-files was not specified:"
+        to_remove.each { |file| puts "   #{file}" }
+      end
+    end
+
+    def list_repomd_files(repo_md_path)
+      doc = REXML::Document.new(File.new(repo_md_path))
+      filenames = []
+      doc.root.elements.each do |data|
+        locations = data.elements['location']
+        next unless locations
+
+        if locations.attributes
+          filenames << locations.attributes['href']
+        end
+      end
+      base_names(filenames.flatten)
+    end
+
+    def list_existing_files(repo_md_path)
+      base_names(Dir[File.dirname(repo_md_path) + '/*']) - [REPOMD_FILE]
+    end
+
+    def base_names(file_list)
+      file_list.map { |file| File.basename(file) }
+    end
+  end
+end

data/definitions/scenarios/content.rb

@@ -97,6 +97,24 @@ module ForemanMaintain::Scenarios
       end
     end
 
+    class CleanupRepositoryMetadata < ContentBase
+      metadata do
+        label :cleanup_repository_metadata
+        description 'Remove old leftover repository metadata'
+        param :remove_files, 'Actually remove the files? Otherwise a dryrun is performed.'
+
+        manual_detection
+      end
+
+      def compose
+        add_step_with_context(Procedures::Pulp::CleanupOldMetadataFiles)
+      end
+
+      def set_context_mapping
+        context.map(:remove_files, Procedures::Pulp::CleanupOldMetadataFiles => :remove_files)
+      end
+    end
+
     class RemovePulp2 < ContentBase
       metadata do
         label :content_remove_pulp2

data/lib/foreman_maintain/cli/content_command.rb

@@ -34,6 +34,17 @@ module ForemanMaintain
         end
       end
 
+      subcommand 'cleanup-repository-metadata', 'Cleanup old repository metadata under Pulp 2' do
+        option ['-r', '--remove-files'], :flag, 'Remove the files instead of just listing them.',
+               :attribute_name => :remove_files
+
+        def execute
+          run_scenarios_and_exit(
+            Scenarios::Content::CleanupRepositoryMetadata.new(:remove_files => @remove_files)
+          )
+        end
+      end
+
       subcommand 'remove-pulp2', 'Remove pulp2 and mongodb packages and data' do
         def execute
           run_scenarios_and_exit(Scenarios::Content::RemovePulp2.new)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.11'.freeze
+  VERSION = '0.7.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-05 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -260,6 +260,7 @@ files:
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/passenger_recycler.rb
 - definitions/procedures/prep_6_10_upgrade.rb
+- definitions/procedures/pulp/cleanup_old_metadata_files.rb
 - definitions/procedures/pulp/migrate.rb
 - definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
@@ -404,7 +405,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -419,8 +420,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []