katello 3.18.3.1 → 3.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9aff3d142eea532e4af243e46c2b98a4cc1016a60f652d2dd9514dc9f416371
-  data.tar.gz: ea80686280189f05d2ffcbfe8e3cf0406fa2b985082b43e15338f62bca099209
+  metadata.gz: df5549e179ab505d6ebd9d8f3acb01cc2555b6bb9904d8d2e88f151c30f6113f
+  data.tar.gz: 1e23f8b93a96fcdc0e2a437f7c7f0b69a2411ba95a93c0ddf79e1b7a5312a254
 SHA512:
-  metadata.gz: b569aa5d2a488f3f248c4e29dfaf4c51ad1c014b9bcd2c20bf1c99f09f27d57b4490f1e8fd9c5f78b65a1f584e3f2f1262b91f6d0b57cb9c487781176a16de52
-  data.tar.gz: d0f344773b0172a608ca677effbb942fbf2b62386cf1179aefe3e8faf7fa5e0c16940cffb834a3e7be3007c6314525a09883989b51e714191160baa4dba65470
+  metadata.gz: d72e8ce1315c1825d18ceb696b0cb402cb9127afc17adc59b3c144bee1901ffb1045334f0043e87bc57af2c73edca6dfd1efd1ebf3c88dd2a8029933e981cab8
+  data.tar.gz: 164f2d886dae6691f7d6c212a5f5258930ef0945098508bc37a7c7e065bfed20ff374c7f3c0d50f4bbd20737d0e30551dc00682bed95af8148cf97730c0c213c

data/app/lib/katello/errors.rb

@@ -53,7 +53,7 @@ module Katello
 
     class PulpcoreMissingCapabilities < StandardError
       def message
-        _("A smart proxy seems to have been refreshed without pulpcore being running.  You may want to ")
+        _("A smart proxy seems to have been refreshed without pulpcore being running. Please refresh the smart proxy after ensuring that pulpcore services are running.")
       end
     end
 

data/app/models/katello/ping.rb

@@ -9,7 +9,7 @@ module Katello
         SETTINGS[:katello][:use_pulp_2_for_content_type].nil? || (!SETTINGS[:katello][:use_pulp_2_for_content_type][:yum] &&
         !SETTINGS[:katello][:use_pulp_2_for_content_type][:docker] &&
         !SETTINGS[:katello][:use_pulp_2_for_content_type][:file]) ||
-        system('systemctl is-enabled pulpcore-api.service')
+        File.exist?('/etc/systemd/system/multi-user.target.wants/pulpcore-api.service')
       end
 
       def services(capsule_id = nil)

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

@@ -166,7 +166,7 @@ module Katello
 
       def create_migrations
         plan = migration_plan
-        Rails.logger.info("Migration Plan: #{plan}")
+        Rails.logger.info("Migration Plan: #{plan.to_yaml}")
 
         if plan['plugins'].empty?
           Rails.logger.error("No Repositories to migrate")
@@ -310,6 +310,24 @@ module Katello
                                             on_duplicate_key_update: {conflict_target: [:erratum_id, :repository_id], columns: [:erratum_pulp3_href]})
           to_import = {}
         end
+        correct_missing_errata
+      end
+
+      def correct_missing_errata
+        Katello::RepositoryErratum.where(:erratum_pulp3_href => nil).pluck(:repository_id).uniq.each do |repo_id|
+          repo = Katello::Repository.find(repo_id)
+          if repo.link?
+            target = repo.target_repository
+            to_import = []
+            target.repository_errata.each do |repo_errata|
+              to_import << {erratum_id: repo_errata.erratum_id, erratum_pulp3_href: repo_errata.erratum_pulp3_href, repository_id: repo_id}
+            end
+            Katello::RepositoryErratum.import([:erratum_id, :erratum_pulp3_href, :repository_id], to_import, :validate => false,
+                                            on_duplicate_key_update: {conflict_target: [:erratum_id, :repository_id], columns: [:erratum_pulp3_href]})
+          else
+            Rails.logger.error("Unexpectedly found target repo (ID=#{repo_id}) with missing migrated errata!")
+          end
+        end
       end
 
       def mark_missing_content(content_type)

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

@@ -14,7 +14,6 @@ module Katello
         Katello::Logging.time("CONTENT_MIGRATION - Generating Migration plan") do
           plan[:plugins] = generate_plugins
         end
-        Rails.logger.error("Migration Plan: #{plan.to_json}")
         plan
       end
 
@@ -105,7 +104,15 @@ module Katello
       end
 
       def name_for_content_view(content_view, root_repo)
-        "#{content_view.label}-#{root_repo.label}"
+        name = "#{content_view.label}-#{root_repo.label}"
+
+        if Katello::RootRepository.where(:label => root_repo.label).group(:label).count(:label)[root_repo.label] > 1
+          repo_query = Katello::Repository.joins(:root, :content_view_version => :content_view).
+              where("#{::Katello::RootRepository.table_name}.id != #{root_repo.id}").
+              where("#{::Katello::RootRepository.table_name}.label" => root_repo.label, "#{::Katello::ContentView.table_name}.label" => content_view.label)
+          name += "-#{root_repo.id}" if repo_query.any?
+        end
+        name
       end
 
       def content_view_migration(content_view, root)

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

@@ -85,7 +85,7 @@ module Katello
 
       def cancel
         tasks_api = core_api.tasks_api
-        tasks_response = core_api.fetch_from_list do |page_opts|
+        tasks_response = core_api.class.fetch_from_list do |page_opts|
           tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: 'running,waiting'))
         end
         tasks_response.collect do |result|

data/lib/katello/tasks/check_config.rake

@@ -7,12 +7,5 @@ namespace :katello do
     if SETTINGS[:katello][:use_pulp_2_for_content_type].nil?
       fail fail_msg
     end
-
-    if !SETTINGS[:katello][:use_pulp_2_for_content_type][:docker] &&
-      !SETTINGS[:katello][:use_pulp_2_for_content_type][:file] &&
-      !SETTINGS[:katello][:use_pulp_2_for_content_type][:yum] &&
-      !SETTINGS[:katello][:use_pulp_2_for_content_type][:deb]
-      fail fail_msg
-    end
   end
 end

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -6,31 +6,38 @@ namespace :katello do
   task :pulp3_content_switchover => ["dynflow:client", "check_config"] do
     dryrun = ENV['DRYRUN']
 
-    begin
-      User.current = User.anonymous_admin
+    if !SETTINGS[:katello][:use_pulp_2_for_content_type][:docker] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:file] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:yum] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:deb]
+      puts "Switchover is already complete, skipping switchover task."
+    else
+      begin
+        User.current = User.anonymous_admin
 
-      switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_primary)
-      switchover_service.remove_orphaned_content #run out of transaction for easier re-run
-      ActiveRecord::Base.transaction do
-        switchover_service.run
-        fail "Dryrun completed without error, aborting and rolling back" if dryrun
+        switchover_service = Katello::Pulp3::MigrationSwitchover.new(SmartProxy.pulp_primary)
+        switchover_service.remove_orphaned_content #run out of transaction for easier re-run
+        ActiveRecord::Base.transaction do
+          switchover_service.run
+          fail "Dryrun completed without error, aborting and rolling back" if dryrun
+        end
+      rescue Katello::Pulp3::SwitchOverError => e
+        $stderr.print(e.message)
+        exit 1
       end
-    rescue Katello::Pulp3::SwitchOverError => e
-      $stderr.print(e.message)
-      exit 1
-    end
 
-    task = ForemanTasks.async_task(Actions::Pulp3::ContentGuard::RefreshAllDistributions, SmartProxy.pulp_primary)
-    until !task.pending? || task.paused?
-      sleep(10)
-      task = ForemanTasks::Task.find(task.id)
-    end
-    if task.result == 'error' || task.result == 'pending'
-      msg _("Content Guard Configuration failed, switchover aborted.  Switchover continuing, but after completion, you will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}")
-      Rails.logger.error(msg)
-      $stderr.print(msg)
-    else
-      puts _("Content Switchover completed successfully")
+      task = ForemanTasks.async_task(Actions::Pulp3::ContentGuard::RefreshAllDistributions, SmartProxy.pulp_primary)
+      until !task.pending? || task.paused?
+        sleep(10)
+        task = ForemanTasks::Task.find(task.id)
+      end
+      if task.result == 'error' || task.result == 'pending'
+        msg _("Content Guard Configuration failed, switchover aborted.  Switchover continuing, but after completion, you will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}")
+        Rails.logger.error(msg)
+        $stderr.print(msg)
+      else
+        puts _("Content Switchover completed successfully")
+      end
     end
   end
 end

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,48 +1,55 @@
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
   task :pulp3_migration => ["dynflow:client", 'check_config'] do
-    services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
-    Katello::Ping.ping!(services: services)
+    if !SETTINGS[:katello][:use_pulp_2_for_content_type][:docker] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:file] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:yum] &&
+        !SETTINGS[:katello][:use_pulp_2_for_content_type][:deb]
+      puts "Switchover is already complete, skipping migration work."
+    else
+      services = [:candlepin, :foreman_tasks, :pulp3, :pulp, :pulp_auth]
+      Katello::Ping.ping!(services: services)
 
-    puts "Starting task."
-    SmartProxy.pulp_primary.refresh
+      puts "Starting task."
+      SmartProxy.pulp_primary.refresh
 
-    reimport_all = ::Foreman::Cast.to_bool(ENV['reimport_all'])
-    wait = ::Foreman::Cast.to_bool(ENV['wait'] || 'true')
-    preserve_output = ::Foreman::Cast.to_bool(ENV['preserve_output'])
+      reimport_all = ::Foreman::Cast.to_bool(ENV['reimport_all'])
+      wait = ::Foreman::Cast.to_bool(ENV['wait'] || 'true')
+      preserve_output = ::Foreman::Cast.to_bool(ENV['preserve_output'])
 
-    User.current = User.anonymous_api_admin
-    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: reimport_all)
+      User.current = User.anonymous_api_admin
+      task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, SmartProxy.pulp_primary, reimport_all: reimport_all)
 
-    if wait
-      clear_count = nil
-      until !task.pending? || task.paused?
-        $stdout.print("\r#{' ' * clear_count}\r") if clear_count && !preserve_output #clear the line before printing
-        $stdout.print("\n") if preserve_output
-        message = "#{Time.now.to_s}: #{task.humanized[:output]}"
-        clear_count = message.length + 1
-        $stdout.print(message)
+      if wait
+        clear_count = nil
+        until !task.pending? || task.paused?
+          $stdout.print("\r#{' ' * clear_count}\r") if clear_count && !preserve_output #clear the line before printing
+          $stdout.print("\n") if preserve_output
+          message = "#{Time.now.to_s}: #{task.humanized[:output]}"
+          clear_count = message.length + 1
+          $stdout.print(message)
 
-        sleep(10)
-        task = ForemanTasks::Task.find(task.id)
-      end
+          sleep(10)
+          task = ForemanTasks::Task.find(task.id)
+        end
 
-      if task.result == 'warning' || task.result == 'pending'
-        msg = _("Migration failed, You will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}\n")
-        $stderr.print(msg)
-        fail ForemanTasks::TaskError, task
-      else
-        puts
-        Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
-          if type.missing_migrated_content.any?
-            puts "Some corrupted or missing content found, run 'foreman-maintain content migration-stats' for more information."
-            exit(-1)
+        if task.result == 'warning' || task.result == 'pending'
+          msg = _("Migration failed, You will want to investigate: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}\n")
+          $stderr.print(msg)
+          fail ForemanTasks::TaskError, task
+        else
+          puts
+          Katello::Pulp3::Migration::CORRUPTABLE_CONTENT_TYPES.each do |type|
+            if type.missing_migrated_content.any?
+              puts "Some corrupted or missing content found, run 'foreman-maintain content migration-stats' for more information."
+              exit(-1)
+            end
           end
+          puts _("Content Migration completed successfully")
         end
-        puts _("Content Migration completed successfully")
+      else
+        puts "Migration started, you may monitor it at: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}"
       end
-    else
-      puts "Migration started, you may monitor it at: https://#{Socket.gethostname}/foreman_tasks/tasks/#{task.id}"
     end
   end
 end

data/lib/katello/tasks/pulp3_migration_abort.rake

@@ -17,6 +17,12 @@ namespace :katello do
       cancelled_tasks_count += 1 if cancelled_task
     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
+    end
+
     puts _("\e[33mCancelled #{cancelled_tasks_count} tasks.\e[0m")
   end
 end

data/lib/katello/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.18.3.1
+  version: 3.18.4
 platform: ruby
 authors:
 - N/A
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-14 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,6 +100,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: foreman-tasks-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
@@ -346,20 +360,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: pulp_rpm_client
   requirement: !ruby/object:Gem::Requirement