foreman_maintain 0.7.6 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743d74ea6833807f28ea4f14096821c03d080ede64f8cc74ee4146b4dd8eea26
-  data.tar.gz: 4b54030179cb8019c0a5936f5accfb8a91f6a092c9221cd1b03e9d342c5bbaa3
+  metadata.gz: 89f8cd453e8f9b19bec3b8912f8c88c0bfe4d20c08268c42c77b3748a9b0ebcf
+  data.tar.gz: 8c1f5fcbba0d7c94e349290ee5b21e313435dc1ad55ab2c782b216b393481cb4
 SHA512:
-  metadata.gz: 89f47a46c1061c416d9042c116dea5ad0acbf973418d4452e44500a8ebbb55cd598d3d3001332ec92970094dd2ebd36af8a92fde9d28835a5544e96d6bd333d0
-  data.tar.gz: 370b409946044d658e102e0aa64733842163b5834289b7cf059dd16733ee2e6f1263aa6221212caa3b5fcb1f77fd81519c414e542357cac8df579f0d4031c7fd
+  metadata.gz: f2572cdbd94ca61bf489eb1ad9354125fe4993c5d448ba0804aaa211cb17559c0ea307c96d63b56ed1dfa76649ebfa3750b7778ca7e95e57758bd454931613fa
+  data.tar.gz: c31975cb3a4f4d27361b20834329262eef2409d73e65c29ead3207fa27d14288b37864c919cb9cb229f7760d95b09714a3ffe605d0cd73f09dffb6fb4f458508

data/definitions/checks/disk/available_space_postgresql12.rb

@@ -0,0 +1,45 @@
+module Checks
+  module Disk
+    class AvailableSpacePostgresql12 < ForemanMaintain::Check
+      metadata do
+        label :available_space_for_postgresql12
+        description 'Check to make sure PostgreSQL 12 work directory has enough space for upgrade'
+        confine do
+          (feature(:foreman_database) || feature(:candlepin_database)) && \
+            (file_exists?('/var/lib/pgsql') && \
+            file_exists?('/var/opt/rh/rh-postgresql12'))
+        end
+      end
+
+      def run
+        assert(psql_12_available_space >= psql_9_consumed_space, warning_message, :warn => true)
+      end
+
+      def pgsql_dir(version)
+        if version == 9
+          '/var/lib/pgsql/'
+        elsif version == 12
+          '/var/opt/rh/rh-postgresql12/'
+        end
+      end
+
+      def psql_9_consumed_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(9))
+        io_obj.space_used
+      end
+
+      def psql_12_available_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(12))
+        io_obj.available_space
+      end
+
+      def warning_message
+        sat_version = feature(:satellite).current_version.version[0..2]
+        "Satellite #{sat_version} uses PostgreSQL 12. \nThis changes PostgreSQL "\
+        "work directory to #{pgsql_dir(12)}\n"\
+        "The new work directory requires at least #{psql_9_consumed_space}"\
+        'MiB free space for upgrade!'
+      end
+    end
+  end
+end

data/definitions/features/dynflow_sidekiq.rb

@@ -37,6 +37,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
   end
 
   def configured_instances
-    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
+    Dir['/etc/foreman/dynflow/*.yml'].map { |config| File.basename(config, '.yml') }
   end
 end

data/definitions/features/mongo.rb

@@ -141,13 +141,13 @@ class Features::Mongo < ForemanMaintain::Feature
   end
 
   def mongo_cmd_available?
-    exit_status, _output = execute_with_status("which #{core.client_command}")
+    exit_status, _output = execute_with_status('which mongo')
     exit_status == 0
   end
 
   def raise_mongo_client_missing_error
-    raise ForemanMaintain::Error::Fail, "The #{core.client_command} command not found."\
-                                  " Make sure system has #{core.client_command} utility installed."
+    raise ForemanMaintain::Error::Fail, 'The mongo command not found.'\
+                                  ' Make sure system has mongo utility installed.'
   end
 
   private

data/definitions/features/service.rb

@@ -25,9 +25,10 @@ class Features::Service < ForemanMaintain::Feature
       select(&:exist?)
   end
 
-  def filtered_services(options)
+  def filtered_services(options, action = '')
     services = include_unregistered_services(existing_services, options[:include])
-    services = filter_services(services, options)
+    services = filter_services(services, options, action)
+
     raise 'No services found matching your parameters' unless services.any?
     return services unless options[:reverse]
 
@@ -61,59 +62,49 @@ class Features::Service < ForemanMaintain::Feature
   def run_action_on_services(action, options, spinner)
     status = 0
     failed_services = []
-    filtered_services(options).each_value do |group|
-      systemctl_status, _output = execute_with_status('systemctl ' \
-        "#{action} #{group.map(&:name).join(' ')}")
-      display_status(group, options, action, spinner)
-      if systemctl_status > 0
-        status = systemctl_status
-        failed_services |= failed_services_by_status(action, group, spinner)
+    filtered_services(options, action).each_value do |group|
+      fork_threads_for_services(action, group, spinner).each do |service, status_and_output|
+        spinner.update("#{action_noun(action)} #{service}") if action == 'status'
+        item_status, output = status_and_output
+        formatted = format_status(output, item_status, options)
+        puts formatted unless formatted.empty?
+
+        if item_status > 0
+          status = item_status
+          failed_services << service
+        end
       end
     end
     [status, failed_services]
   end
 
-  def display_status(services, options, action, spinner)
+  def fork_threads_for_services(action, services, spinner)
+    services_and_statuses = []
     services.each do |service|
-      spinner.update("#{action_noun(action)} #{service}")
-      formatted = format_status(service.status, options, action)
-      puts formatted unless formatted.empty?
+      spinner.update("#{action_noun(action)} #{service}") if action != 'status'
+      services_and_statuses << [service, Thread.new { service.send(action.to_sym) }]
     end
+    services_and_statuses.map! { |service, status| [service, status.value] }
   end
 
-  def format_status(service_status, options, action)
-    exit_code, output = service_status
+  def format_status(output, exit_code, options)
     status = ''
     if !options[:failing] || exit_code > 0
       if options[:brief]
         status += format_brief_status(exit_code)
-      elsif include_output?(action, exit_code)
+      elsif !(output.nil? || output.empty?)
         status += "\n" + output
       end
     end
     status
   end
 
-  def include_output?(action, status)
-    (action == 'start' && status > 0) ||
-      action == 'status'
-  end
-
   def format_brief_status(exit_code)
     result = exit_code == 0 ? reporter.status_label(:success) : reporter.status_label(:fail)
     padding = reporter.max_length - reporter.last_line.to_s.length - 30
     "#{' ' * padding} #{result}"
   end
 
-  def failed_services_by_status(action, services, spinner)
-    failed_services = []
-    services.each do |service|
-      spinner.update("#{action_noun(action)} #{service}")
-      failed_services << service unless service.running?
-    end
-    failed_services
-  end
-
   def allowed_action?(action)
     %w[start stop restart status enable disable].include?(action)
   end
@@ -125,7 +116,8 @@ class Features::Service < ForemanMaintain::Feature
     service_list + socket_list
   end
 
-  def filter_services(service_list, options)
+  # rubocop:disable Metrics/AbcSize
+  def filter_services(service_list, options, action)
     if options[:only] && options[:only].any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
@@ -138,8 +130,17 @@ class Features::Service < ForemanMaintain::Feature
     end
 
     service_list = extend_service_list_with_sockets(service_list, options)
+    service_list = filter_disabled_services!(action, service_list)
     service_list.group_by(&:priority).to_h
   end
+  # rubocop:enable Metrics/AbcSize
+
+  def filter_disabled_services!(action, service_list)
+    if %w[start stop restart status].include?(action)
+      service_list.select!(&:enabled?)
+    end
+    service_list
+  end
 
   def include_unregistered_services(service_list, services_filter)
     return service_list unless services_filter

data/definitions/procedures/content/switchover.rb

@@ -19,8 +19,11 @@ module Procedures::Content
       puts execute!('foreman-rake katello:pulp3_content_switchover')
       puts 'Re-running the installer to switch specified content over to pulp3'
       args = ['--foreman-proxy-content-proxy-pulp-isos-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-yum-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-deb-to-pulpcore=true',
               '--katello-use-pulp-2-for-file=false',
               '--katello-use-pulp-2-for-docker=false',
+              '--katello-use-pulp-2-for-deb=false',
               '--katello-use-pulp-2-for-yum=false']
       feature(:installer).run(args.join(' '))
     end

data/definitions/procedures/service/base.rb

@@ -16,7 +16,7 @@ module Procedures
       def run_service_action(action, options)
         action_noun = feature(:service).action_noun(action).capitalize
         puts "\n#{action_noun} the following service(s):"
-        services = feature(:service).filtered_services(options)
+        services = feature(:service).filtered_services(options, action)
         print_services(services)
         with_spinner('') do |spinner|
           feature(:service).handle_services(spinner, action, options)

data/definitions/scenarios/content.rb

@@ -1,6 +1,23 @@
 module ForemanMaintain::Scenarios
   module Content
-    class Prepare < ForemanMaintain::Scenario
+    class ContentBase < ForemanMaintain::Scenario
+      def enable_and_start_services
+        add_step(Procedures::Service::Start)
+        add_step(Procedures::Service::Enable.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+        add_step(Procedures::Service::Start.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+      end
+
+      def disable_and_stop_services
+        add_step(Procedures::Service::Stop.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+        add_step(Procedures::Service::Disable.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+      end
+    end
+
+    class Prepare < ContentBase
       metadata do
         label :content_prepare
         description 'Prepare content for Pulp 3'
@@ -16,26 +33,9 @@ module ForemanMaintain::Scenarios
           add_step(Procedures::Content::Prepare)
         end
       end
-
-      private
-
-      def enable_and_start_services
-        add_step(Procedures::Service::Start)
-        add_step(Procedures::Service::Enable.
-                 new(:only => Features::Pulpcore.pulpcore_migration_services))
-        add_step(Procedures::Service::Start.
-                 new(:only => Features::Pulpcore.pulpcore_migration_services))
-      end
-
-      def disable_and_stop_services
-        add_step(Procedures::Service::Stop.
-                 new(:only => Features::Pulpcore.pulpcore_migration_services))
-        add_step(Procedures::Service::Disable.
-                 new(:only => Features::Pulpcore.pulpcore_migration_services))
-      end
     end
 
-    class Switchover < ForemanMaintain::Scenario
+    class Switchover < ContentBase
       metadata do
         label :content_switchover
         description 'Switch support for certain content from Pulp 2 to Pulp 3'
@@ -51,7 +51,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    class PrepareAbort < ForemanMaintain::Scenario
+    class PrepareAbort < ContentBase
       metadata do
         label :content_prepare_abort
         description 'Abort all running Pulp 2 to Pulp 3 migration tasks'
@@ -65,7 +65,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    class MigrationStats < ForemanMaintain::Scenario
+    class MigrationStats < ContentBase
       metadata do
         label :content_migration_stats
         description 'Retrieve Pulp 2 to Pulp 3 migration statistics'
@@ -79,7 +79,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    class MigrationReset < ForemanMaintain::Scenario
+    class MigrationReset < ContentBase
       metadata do
         label :content_migration_reset
         description 'Reset the Pulp 2 to Pulp 3 migration data (pre-switchover)'
@@ -97,7 +97,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    class RemovePulp2 < ForemanMaintain::Scenario
+    class RemovePulp2 < ContentBase
       metadata do
         label :content_remove_pulp2
         description 'Remove Pulp2 and mongodb packages and data'

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_8
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.8'))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_9.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_9
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.9'))
     end
   end

data/lib/foreman_maintain/runner.rb

@@ -15,6 +15,7 @@ module ForemanMaintain
       @reporter = reporter
       @scenarios = Array(scenarios)
       @quit = false
+      @rescue = false
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
@@ -29,12 +30,17 @@ module ForemanMaintain
       @assumeyes
     end
 
+    def rescue?
+      @rescue
+    end
+
     def run
       @scenarios.each do |scenario|
         run_scenario(scenario)
         next unless @quit
 
         if @rescue_scenario
+          @rescue = true
           logger.debug('=== Rescue scenario found. Executing ===')
           execute_scenario_steps(@rescue_scenario, true)
         end
@@ -44,10 +50,10 @@ module ForemanMaintain
 
     def run_scenario(scenario)
       return if scenario.steps.empty?
-      raise 'The runner is already in quit state' if quit?
+      raise 'The runner is already in quit state' if quit? && !rescue?
 
       confirm_scenario(scenario)
-      return if quit?
+      return if quit? && !rescue?
 
       execute_scenario_steps(scenario)
     ensure

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -26,6 +26,10 @@ module ForemanMaintain
           execute!("df #{dir}|awk {'print $5'}|tail -1").to_i
         end
 
+        def space_used
+          convert_kb_to_mb(execute!("du -ks #{dir} | awk {'print $1'}").to_i)
+        end
+
         private
 
         # In fio command, --direct option bypass the cache page

data/lib/foreman_maintain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-02 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -126,6 +126,7 @@ files:
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb
+- definitions/checks/disk/available_space_postgresql12.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_checkpoint_segments.rb
@@ -418,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt