katello 3.18.4 → 3.18.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df5549e179ab505d6ebd9d8f3acb01cc2555b6bb9904d8d2e88f151c30f6113f
-  data.tar.gz: 1e23f8b93a96fcdc0e2a437f7c7f0b69a2411ba95a93c0ddf79e1b7a5312a254
+  metadata.gz: 625ecabd197fcf1e9562afe5ab95076a78aad73960543c9804d0510f36bfc398
+  data.tar.gz: 0a6c82ff085f980e9d028a9734f3d071fa5324e6354b0c45b49406bf4400783c
 SHA512:
-  metadata.gz: d72e8ce1315c1825d18ceb696b0cb402cb9127afc17adc59b3c144bee1901ffb1045334f0043e87bc57af2c73edca6dfd1efd1ebf3c88dd2a8029933e981cab8
-  data.tar.gz: 164f2d886dae6691f7d6c212a5f5258930ef0945098508bc37a7c7e065bfed20ff374c7f3c0d50f4bbd20737d0e30551dc00682bed95af8148cf97730c0c213c
+  metadata.gz: ff6a670562b076e29b4112e22b8575ae0fbc8a1864377ea538e642207a9b78e574e1bcffb9c611f61691303fb9f5b8a56e80dda96b6391d96ab836b8cfc5ab7c
+  data.tar.gz: f8b4a6bb32933ef5a12ebc1dab3e1e06b023c39834b9fd58dad920912ce84f25ac6974cad9611ae6d6cd87b4b2bbd45d38d71604bf42d5ebb8be72f5b93f3293

data/app/lib/actions/pulp3/content_guard/refresh_all_distributions.rb

@@ -6,7 +6,8 @@ module Actions
           sequence do
             plan_action(Actions::Pulp3::ContentGuard::Refresh, smart_proxy)
 
-            roots = ::Katello::RootRepository.where.not(:content_type => ::Katello::Repository::DOCKER_TYPE).where(:unprotected => false)
+            protected_types = [::Katello::Repository::YUM_TYPE, ::Katello::Repository::FILE_TYPE, ::Katello::Repository::DEB_TYPE]
+            roots = ::Katello::RootRepository.where(:content_type => protected_types).where(:unprotected => false)
             repositories = ::Katello::Repository.where(:root => roots)
             if repositories.any?
               plan_action(::Actions::BulkAction, Actions::Pulp3::Repository::RefreshDistribution, repositories, smart_proxy.id, assume_content_guard_exists: true)

data/app/lib/actions/pulp3/content_migration_presenter.rb

@@ -38,7 +38,9 @@ module Actions
         end
 
         def humanized_output
-          report = task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 }
+          #prefer running reports where the done and total do not match
+          report = task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 && current['done'] != current['total'] }
+          report ||= task_progress_reports.find { |current| current['state'] == 'running' && current['total'] != 0 }
           report ||= task_group_progress_reports.find { |current| current['total'] != 0 && current['done'] != current['total'] }
 
           if !report.blank? && report['total'] != 0
@@ -46,7 +48,8 @@ module Actions
           elsif report
             report['message']
           elsif task_progress_reports.empty?
-            "Content migration starting. "
+            "Content migration starting. These steps may take a while to complete. " \
+            "Refer to `foreman-maintain content migration-stats` for an estimate."
           else
             "Initial Migration steps complete."
           end

data/app/services/katello/pulp/repository.rb

@@ -296,11 +296,13 @@ module Katello
 
         if proxy
           uri = URI(proxy.url)
+          username = CGI.escape(proxy.username) if proxy.username
+          password = CGI.escape(proxy.password) if proxy.password
           proxy_options = {
             proxy_host: uri.scheme + '://' + uri.host,
             proxy_port: uri.port,
-            proxy_username: proxy.username,
-            proxy_password: proxy.password
+            proxy_username: username,
+            proxy_password: password
           }
           return proxy_options
         end

data/app/services/katello/pulp3/migration.rb

@@ -216,7 +216,7 @@ module Katello
 
           if to_find
             found = migrated_repo_items.find { |migrated_repo| migrated_repo.pulp2_repo_id == to_find.pulp_id }
-            import_repo(yum_repo, found)
+            import_repo(yum_repo, found) if found
           end
         end
       end

data/app/services/katello/pulp3/migration_plan.rb

@@ -38,6 +38,7 @@ module Katello
         roots = Katello::RootRepository.where(:content_type => repo_type).order(:label)
         plans = []
         roots.each do |root|
+          next unless root.library_instance
           plans << library_migration_for(root)
           plans += content_view_migrations_for(root)
         end
@@ -63,6 +64,8 @@ module Katello
       def library_migration_for(root)
         repo = root.library_instance
 
+        return nil unless library_repo_safe_to_migrate?(repo)
+
         migration = {
           name: repo.pulp_id,
           repository_versions: [
@@ -76,10 +79,49 @@ module Katello
         migration
       end
 
+      def library_repo_safe_to_migrate?(repo)
+        publish_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::ContentView::Publish')
+        publishing_repo_ids = publish_tasks.where(state: ['scheduled', 'running']).collect do |task|
+          ::Katello::ContentViewVersion.find(task.input[:content_view_version_id]).library_repos.pluck(:id)
+        end
+        publishing_repo_ids = publishing_repo_ids.flatten
+
+        if publishing_repo_ids.include?(repo.id)
+          warn_string = "Library repository with ID #{repo.id} and name #{repo.name} unmigrated due to being "\
+            "associated with an actively-publishing content view.  The migration will need to be run again."
+          Rails.logger.warn(warn_string)
+          return false
+        end
+
+        create_root_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::Repository::CreateRoot')
+        active_creation_task = create_root_tasks.where(state: ['scheduled', 'running']).detect do |task|
+          task.input[:repository][:id] == repo.id
+        end
+
+        if active_creation_task.present?
+          warn_string = "Repository with ID #{repo.id} and name #{repo.name} unmigrated due to being "\
+            "created during the Pulp 3 migration.  The migration will need to be run again."
+          Rails.logger.warn(warn_string)
+          return false
+        end
+        true
+      end
+
       def content_view_migrations_for(root)
+        publish_tasks = ForemanTasks::Task.where(label: 'Actions::Katello::ContentView::Publish')
+        publishing_cv_ids = publish_tasks.where(state: ['scheduled', 'running']).collect do |task|
+          task.input[:content_view_id]
+        end
+
         plans = []
         ContentView.non_default.published_with_repositories(root).sort_by(&:label).each do |cv|
-          plans << content_view_migration(cv, root)
+          if publishing_cv_ids.include?(cv.id)
+            warn_string = "Repositories belonging to Content View with ID #{cv.id} and name #{cv.name} unmigrated "\
+              "due to being created during the Pulp 3 migration.  The migration will need to be run again."
+            Rails.logger.warn(warn_string)
+          else
+            plans << content_view_migration(cv, root)
+          end
         end
         plans
       end

data/lib/katello/tasks/pulp3_migration.rake

@@ -18,6 +18,7 @@ namespace :katello do
       preserve_output = ::Foreman::Cast.to_bool(ENV['preserve_output'])
 
       User.current = User.anonymous_api_admin
+      Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_primary).remove_orphaned_content
       task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: reimport_all)
 
       if wait
@@ -28,6 +29,7 @@ namespace :katello do
           message = "#{Time.now.to_s}: #{task.humanized[:output]}"
           clear_count = message.length + 1
           $stdout.print(message)
+          $stdout.flush
 
           sleep(10)
           task = ForemanTasks::Task.find(task.id)

data/lib/katello/tasks/pulp3_migration_abort.rake

@@ -18,9 +18,11 @@ namespace :katello do
     end
 
     api = Katello::Pulp3::Api::Core.new(SmartProxy.pulp_primary)
-    api.tasks_api.list(:state__in => 'running,waiting', :name => 'pulp_2to3_migration.app.migration.complex_repo_migration').results.each do |task|
-      api.cancel_task(task.pulp_href)
-      cancelled_tasks_count += 1
+    %w(pulp_2to3_migration.app.tasks.migrate.migrate_from_pulp2 pulp_2to3_migration.app.migration.complex_repo_migration).each do |task_label|
+      api.tasks_api.list(:state__in => 'running,waiting', :name => task_label).results.each do |task|
+        api.cancel_task(task.pulp_href)
+        cancelled_tasks_count += 1
+      end
     end
 
     puts _("\e[33mCancelled #{cancelled_tasks_count} tasks.\e[0m")

data/lib/katello/tasks/pulp3_migration_approve_corrupted.rake

@@ -1,13 +1,18 @@
 namespace :katello do
   desc "Marks corrupted or missing content as approved to be ignored during the migration"
-  task :approve_corrupted_migration_content => ["dynflow:client", "check_ping"] do
+  task :approve_corrupted_migration_content => ["dynflow:client"] do
+    services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
+    Katello::Ping.ping!(services: services)
+
     Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
       type.missing_migrated_content.update_all(:ignore_missing_from_migration => true)
     end
     puts "Any missing or corrupt content will be ignored on migration to Pulp 3.  This can be undone with 'foreman-rake katello:unapprove_corrupted_migration_content'"
   end
 
-  task :unapprove_corrupted_migration_content => ["dynflow:client", "check_ping"] do
+  task :unapprove_corrupted_migration_content => ["dynflow:client"] do
+    services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
+    Katello::Ping.ping!(services: services)
     Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
       type.ignored_missing_migrated_content.update_all(:ignore_missing_from_migration => false)
     end

data/lib/katello/tasks/pulp3_migration_stats.rake

@@ -28,10 +28,14 @@ namespace :katello do
     puts "Migrated/Total RPMs: #{migrated_rpm_count}/#{::Katello::Rpm.count}"
     puts "Migrated/Total errata: #{migrated_erratum_count}/#{::Katello::RepositoryErratum.count}"
     puts "Migrated/Total repositories: #{migrated_repo_count}/#{migratable_repo_count}"
-    puts
+
     # The timing formulas go negative if the amount of content is negligibly small
     if migration_minutes >= 5
       puts "Estimated migration time based on yum content: #{hours} hours, #{minutes} minutes"
+    elsif migrated_rpm_count == ::Katello::Rpm.count &&
+      migrated_erratum_count == ::Katello::RepositoryErratum.count &&
+      migrated_repo_count == migratable_repo_count
+      puts "All content has been migrated."
     else
       puts "Estimated migration time based on yum content: fewer than 5 minutes"
     end
@@ -40,6 +44,11 @@ namespace :katello do
     puts "\e[33mNote:\e[0m ensure there is sufficient storage space for /var/lib/pulp/published to triple in size before starting the migration process."
     puts "Check the size of /var/lib/pulp/published with 'du -sh /var/lib/pulp/published/'"
 
+    puts
+    puts "\e[33mNote:\e[0m ensure there is sufficient storage space for postgresql."
+    puts "You will need additional space for your postgresql database.  The partition holding '/var/opt/rh/rh-postgresql12/lib/pgsql/data/'"
+    puts "   will need additional free space equivalent to the size of your Mongo db database (/var/lib/mongodb/)."
+
     displayed_warning = false
     found_missing = false
     path = Dir.mktmpdir('unmigratable_content-')

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.18.4".freeze
+  VERSION = "3.18.5".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.4
+  version: 3.18.5
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -283,7 +283,7 @@ dependencies:
         version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.7.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ dependencies:
         version: 3.6.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.7.7
 - !ruby/object:Gem::Dependency
   name: pulp_file_client
   requirement: !ruby/object:Gem::Requirement