katello 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71f002d889e1ed307d9a97f9cc97266659b04591
-  data.tar.gz: 699bcc1ee8187e27816ef953d3b3a471e0820481
+  metadata.gz: 80f67a786159867d60c20979f0602bb3863524e0
+  data.tar.gz: dd24b2382a538d7153d4ebaa76f237e18fdcd811
 SHA512:
-  metadata.gz: 8b2912f0372097ecb9364fbcdf0d4d7a8d62f46458a272b6bd0bc5f2ed849266283ef23b45f270e0ab568e60fe0cb3e159b21eb7cad604b09c9b740fa5f12f1f
-  data.tar.gz: 403cb22a72f122040550fdf5a309bf4e260545014c19ba8015126813c20e6127ff358866245bd57168a2e2d038ba53f0f4712a6ac1aaa5743962d8662b16d749
+  metadata.gz: 30ddccbb6ff1bc0cffa457ee04d0d0284d350893286f88814a87a616a3d3824742f2d45e1aae77c8f07341f9f7827357dd660f456de87a9a4e5d3098578d8eab
+  data.tar.gz: f0c4848493c531015c3b321b37aa18b0ea3ce9a0e59900a07bc51324571f36a033e20daf7307b2a81a8fca29e0c715f22fc0424b5bee5454d9fbfb9f1e6c3a92

data/app/controllers/katello/api/v2/api_controller.rb

@@ -49,11 +49,18 @@ module Katello
       query = query.select(group).group(group) if group
       sub_total = query.count
 
-      sort_attr = params[:sort_by] || default_sort_by
+      sort_attr = (params[:sort_by] || default_sort_by).to_s.downcase
 
       if sort_attr
-        sort_attr = "#{query.table_name}.#{sort_attr}" unless sort_attr.to_s.include?('.')
-        query = query.order("#{sort_attr} #{params[:sort_order] || default_sort_order}")
+        table, column = sort_attr.split(".").length == 2 ? sort_attr.split(".") : [query.table_name, sort_attr]
+        if ActiveRecord::Base.connection.columns(table).map(&:name).include?(column)
+          sort_attr = "#{table}.#{column}"
+        else
+          sort_attr = default_sort_by
+        end
+        sort_order = (params[:sort_order] || default_sort_order).to_s.downcase
+        sort_order = default_sort_order unless ['desc', 'asc'].include?(sort_order)
+        query = query.order("#{sort_attr} #{sort_order}")
       elsif options[:custom_sort]
         query = options[:custom_sort].call(query)
       end

data/app/lib/actions/pulp/abstract_async_task.rb

@@ -66,12 +66,6 @@ module Actions
       end
 
       def done?
-        output[:pulp_tasks].each do |pulp_task|
-          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
-            fail pulp_exception
-          end
-        end
-
         external_task.all? { |task| task[:finish_time] || FINISHED_STATES.include?(task[:state]) }
       end
 
@@ -97,6 +91,14 @@ module Actions
         end
       end
 
+      def rescue_external_task(error)
+        if error.is_a?(PulpError)
+          raise error
+        else
+          super
+        end
+      end
+
       private
 
       def external_task=(external_task_data)
@@ -112,6 +114,11 @@ module Actions
 
         #Combine new tasks and remove call reports
         output[:pulp_tasks] = external_task_data.reject { |task| task['task_id'].nil? } + new_tasks
+        output[:pulp_tasks].each do |pulp_task|
+          if pulp_exception = ::Katello::Errors::PulpError.from_task(pulp_task)
+            fail pulp_exception
+          end
+        end
       end
 
       def get_new_tasks(current_list, spawned_task_ids)

data/lib/katello/engine.rb

@@ -200,6 +200,7 @@ module Katello
       load "#{Katello::Engine.root}/lib/katello/tasks/rubocop.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/asset_compile.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/clean_backend_objects.rake"
+      load "#{Katello::Engine.root}/lib/katello/tasks/preupgrade_content_host_check.rake"
 
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.1/import_errata.rake"
       load "#{Katello::Engine.root}/lib/katello/tasks/upgrades/2.2/update_gpg_key_urls.rake"
@@ -212,3 +213,4 @@ module Katello
     end
   end
 end
+

data/lib/katello/tasks/preupgrade_content_host_check.rake

@@ -0,0 +1,131 @@
+namespace :katello do
+  task :preupgrade_content_host_check => ["environment"] do
+    desc "Task that can be run before upgrading to Katello 3.0 to show a list of registered Content Hosts that will be deleted."
+
+    ping = ::Katello::Ping.ping
+    if ping[:status] != ::Katello::Ping::OK_RETURN_CODE
+      fail _("Some backend services are not running: %s") % ping.inspect
+    end
+
+    puts "This script makes no modifications and can be re-run multiple times for the most up to date results."
+    puts "Calculating Host changes on upgrade.  This may take a few minutes."
+
+    User.current = User.anonymous_api_admin
+    @systems_to_unregister = {}
+
+    def ensure_one_system_per_hostname(systems)
+      systems = get_systems_with_facts(systems)
+      system_hostnames = group_systems_by_hostname(systems)
+
+      system_hostnames.each do |hostname, duplicate_systems|
+        if duplicate_systems.count > 1
+          unregister_all_but_last_system(duplicate_systems)
+        end
+      end
+    end
+
+    def group_systems_by_hostname(systems)
+      system_hostnames = {}
+
+      systems.each do |system|
+        hostname = system.facts['network.hostname']
+        if system_hostnames[hostname]
+          system_hostnames[hostname].push(system)
+        else
+          system_hostnames[hostname] = [system]
+        end
+      end
+
+      system_hostnames
+    end
+
+    def get_systems_with_facts(systems)
+      systems_to_remove = []
+
+      systems.each do |system|
+        begin
+          facts = system.facts
+          unless facts
+            systems_to_remove.push(system)
+          end
+        rescue RestClient::Exception
+          systems_to_remove.push(system)
+        end
+      end
+
+      systems_to_remove.each do |system|
+        systems.delete(system)
+        unregister_system(system, "This Content Host seems to be missing from the backend service Candlepin.")
+      end
+
+      systems
+    end
+
+    def unregister_all_but_last_system(systems)
+      systems_by_created_date = systems.sort_by(&:created_at)
+      system = systems_by_created_date.pop
+
+      systems_by_created_date.each do |system_to_remove|
+        unregister_system(system_to_remove, "More recently registered Content Host with same hostname #{system.hostname} found.")
+      end
+
+      system
+    end
+
+    def unregister_system(system, cause)
+      @systems_to_unregister[system] ||= []
+      @systems_to_unregister[system] << cause
+    end
+
+    def human_output(systems)
+      puts "\n\nSummary:\n"
+      puts "Content hosts to be preserved: #{::Katello::System.count - systems.count}"
+      puts "Content hosts to be deleted: #{systems.count}"
+    end
+
+    def csv_output(systems)
+      header = 'uuid, name, hostname, last_checkin, causes for deletion'
+      ouptut_lines = systems.map do |system, causes|
+        "#{system.uuid},#{system.name},#{system.hostname},#{system.lastCheckin},#{causes.join("  ")}"
+      end
+      "#{header}\n#{ouptut_lines.join("\n")}"
+    end
+
+    def write_csv(systems)
+      filename = "/tmp/pre-upgrade-#{Time.new.to_i}.csv"
+      file = open(filename, 'w')
+      file.write(csv_output(systems))
+      file.close
+      filename
+    end
+
+    ensure_one_system_per_hostname(Katello::System.all)
+    systems = get_systems_with_facts(Katello::System.all)
+
+    systems.each do |system|
+      next if @systems_to_unregister.include?(system)
+      hostname = system.facts['network.hostname']
+
+      if hostname.nil?
+        unregister_system(system, "Missing hostname information.")
+        break
+      end
+
+      hosts = ::Host.where(:name => hostname)
+      if hosts.any? && hosts.where(:organization_id => system.environment.organization.id).empty? # host is not in the correct org
+        unregister_system(system, "Organization mismatch between Host (#{hosts[0].org.name}) and Content Host #{system.environment.organization.name}.")
+      end
+    end
+
+    if @systems_to_unregister.any?
+      human_output(@systems_to_unregister)
+      puts "Details on Content Hosts planned for deletion saved to #{write_csv(@systems_to_unregister)}"
+      puts "You may want to manually resolve some of the conflicts and duplicate Content Hosts."
+      puts "Upon upgrade those found for deletion will be removed permanently."
+    else
+      puts "Upgrading will not affect any of your Content Hosts."
+    end
+
+    FileUtils.touch('/var/lib/foreman/3.0_upgrade_ready')
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1728,6 +1728,7 @@ files:
 - lib/katello/tasks/jshint.rake
 - lib/katello/tasks/jsroutes.rake
 - lib/katello/tasks/pretty_routes.rake
+- lib/katello/tasks/preupgrade_content_host_check.rake
 - lib/katello/tasks/regenerate_repo_metadata.rake
 - lib/katello/tasks/reindex.rake
 - lib/katello/tasks/rubocop.rake
@@ -1855,7 +1856,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: ''