foreman_maintain 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede9ac694f3aa2331891b0a5a8d6e2d16881baa2705cedda1d6665e2f525617c
-  data.tar.gz: ee459a09c76aeac0d0e62a337e30830b7f93f70a6a48111e81d7af1eed2f6aa0
+  metadata.gz: b7bee1fb68980f7f9358b61a13c7d0a5eba0c78d308ebcfeb717e31cb6c71942
+  data.tar.gz: 808fb2970b786aec29df42004b22ecf82b52e8bd31666410136842c6621d2b67
 SHA512:
-  metadata.gz: e41953a3ec03c60f1a2ee2ab573db15a5fdbfddebf438abbf7a93be1b9512401a430ca13c3f870d010275f3b78d01decc404a00f92cd6087e20fcb8fd057cca4
-  data.tar.gz: 25745f4026a790b816ce52dd378a1747cea9d9598b3167320cb6d4cc3fb531998589371c8512146c7b35b33aa6b3b632aa9af50b005834c416cda0d2c6b47523
+  metadata.gz: 3b5cba26dc0b3011336003c542e7d051b48a1a8896d5b36865d21b25e4a9367b1d1b3929d409ef6bb00fc2947c4f27141e0433a4e14c536291a269c0b334c1f5
+  data.tar.gz: a9e794c196a502b2307506863f0e75e1a4a1a803793986040d118f679f0bd921b0f8a5a95f76516844e97c71f831be5b2cdd9bd7052bb2fc6409dd4089e09f75

data/definitions/checks/foreman_tasks/not_paused.rb

@@ -9,23 +9,20 @@ module Checks::ForemanTasks
     end
 
     def run
-      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count(ignored_tasks)
+      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count()
       assert(paused_tasks_count == 0,
              "There are currently #{paused_tasks_count} paused tasks in the system",
-             :next_steps =>
-               [Procedures::ForemanTasks::Resume.new,
-                Procedures::ForemanTasks::UiInvestigate.new('search_query' => scoped_search_query)])
+             :next_steps => next_procedures)
     end
 
-    # Note: this is for UI link generation only: we are not using scoped search for querying
-    # the tasks itself as we use direct SQL instead
-    def scoped_search_query
-      "state = paused AND label !^(#{ignored_tasks.join(' ')})"
-    end
-
-    def ignored_tasks
-      %w[Actions::Candlepin::ListenOnCandlepinEvents
-         Actions::Katello::EventQueue::Monitor]
+    def next_procedures
+      if assumeyes?
+        return [Procedures::ForemanTasks::Resume.new,
+                Procedures::ForemanTasks::Delete.new(:state => :paused)]
+      end
+      [Procedures::ForemanTasks::Resume.new,
+       Procedures::ForemanTasks::Delete.new(:state => :paused),
+       Procedures::ForemanTasks::UiInvestigate.new('search_query' => 'state = paused')]
     end
   end
 end

data/definitions/features/dynflow_sidekiq.rb

@@ -7,10 +7,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     end
   end
 
-  def services
-    service_names.map { |service| system_service service, instance_priority(service) }
-  end
-
   def config_files
     # Workaround until foreman-installer can deploy scaled workers
     service_symlinks = configured_instances.map do |service|
@@ -22,6 +18,13 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     ].flatten
   end
 
+  def services
+    service_names.map do |service|
+      system_service service, instance_priority(service),
+                     :instance_parent_unit => 'dynflow-sidekiq@'
+    end
+  end
+
   private
 
   def instance_priority(instance)

data/definitions/features/foreman_tasks.rb

@@ -89,6 +89,8 @@ class Features::ForemanTasks < ForemanMaintain::Feature
 
     if state == :old
       old_tasks_condition
+    elsif state == :paused
+      paused_tasks_condition
     else
       tasks_condition(state)
     end
@@ -180,6 +182,10 @@ class Features::ForemanTasks < ForemanMaintain::Feature
        "foreman_tasks_tasks.started_at < CURRENT_DATE - INTERVAL '#{MIN_AGE} days'"
   end
 
+  def paused_tasks_condition(state = "'paused'")
+    "foreman_tasks_tasks.state IN (#{state})"
+  end
+
   def prepare_for_backup(state)
     dir = backup_dir(state)
     execute("mkdir -p #{dir}")
@@ -197,6 +203,6 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def valid(state)
-    %w[old planning pending].include?(state.to_s)
+    %w[old planning pending paused].include?(state.to_s)
   end
 end

data/definitions/features/pulpcore.rb

@@ -11,18 +11,19 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def services
-    pulpcore_common_services + [
+    self.class.pulpcore_common_services + [
+      system_service('rh-redis5-redis', 5),
       system_service('pulpcore-worker@*', 20, :all => true, :skip_enablement => true),
       system_service('httpd', 30)
     ]
   end
 
-  def pulpcore_migration_services
+  def self.pulpcore_migration_services
     pulpcore_common_services + [
-      system_service('pulpcore-worker@1', 20),
-      system_service('pulpcore-worker@2', 20),
-      system_service('pulpcore-worker@3', 20),
-      system_service('pulpcore-worker@4', 20)
+      ForemanMaintain::Utils.system_service('pulpcore-worker@1', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@2', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@3', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@4', 20)
     ]
   end
 
@@ -32,14 +33,11 @@ class Features::Pulpcore < ForemanMaintain::Feature
     ]
   end
 
-  private
-
-  def pulpcore_common_services
+  def self.pulpcore_common_services
     [
-      system_service('rh-redis5-redis', 5),
-      system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
-      system_service('pulpcore-resource-manager', 10)
+      ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
+      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
+      ForemanMaintain::Utils.system_service('pulpcore-resource-manager', 10)
     ]
   end
 end

data/definitions/procedures/backup/online/safety_confirmation.rb

@@ -4,11 +4,12 @@ module Procedures::Backup
       metadata do
         description 'Data consistency warning'
         tags :backup
-        param :include_db_dumps
+        param :include_db_dumps, 'Are database dumps included in backup', :flag => true,
+                                                                          :default => false
       end
 
       def run
-        answer = ask_decision(warning_message(@include_db_dumps), 'y(yes), q(quit)')
+        answer = ask_decision(warning_message(@include_db_dumps), actions_msg: 'y(yes), q(quit)')
         abort! unless answer == :yes
       end
 

data/definitions/procedures/foreman_tasks/delete.rb

@@ -1,6 +1,6 @@
 module Procedures::ForemanTasks
   class Delete < ForemanMaintain::Procedure
-    ALLOWED_STATES_VALUES = %w[old planning pending].freeze
+    ALLOWED_STATES_VALUES = %w[old planning pending paused].freeze
 
     metadata do
       param :state,
@@ -19,12 +19,11 @@ module Procedures::ForemanTasks
           feature(:foreman_tasks).backup_tasks(@state) do |backup_progress|
             spinner.update backup_progress
           end
-
-          spinner.update "Deleting #{@state} tasks [running]"
+          spinner.update "Deleting #{count_tasks_before} #{@state} tasks [running]"
           count_tasks_later = feature(:foreman_tasks).delete(@state)
           spinner.update "Deleting #{@state} tasks [DONE]"
           spinner.update(
-            "Deleted #{@state} stopped and paused tasks: #{count_tasks_before - count_tasks_later}"
+            "Deleted #{@state} tasks: #{count_tasks_before - count_tasks_later}"
           )
         end
       end

data/definitions/procedures/foreman_tasks/resume.rb

@@ -6,8 +6,13 @@ module Procedures::ForemanTasks
       description 'Resume paused tasks'
     end
 
+    WAIT_TIME = 30
+
     def run
       output << feature(:foreman_tasks).resume_task_using_hammer
+      with_spinner('Waiting 30 seconds for resumed tasks to start.') do
+        sleep WAIT_TIME
+      end
     end
   end
 end

data/definitions/procedures/prep_6_10_upgrade.rb

@@ -3,8 +3,7 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
     description 'Preparations for the Satellite 6.10 upgrade'
 
     confine do
-      ::Scenarios.const_defined?('Satellite_6_10') &&
-        feature(:satellite) &&
+      feature(:satellite) &&
         feature(:satellite).current_minor_version == '6.9'
     end
   end
@@ -18,7 +17,6 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
       execute!('find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;')
       spinner.update('$ chown -R :pulp /var/lib/pulp/content')
       FileUtils.chown_R nil, 'pulp', '/var/lib/pulp/content'
-      # TODO: Install Pulp 3 without starting services?
     end
   end
 

data/definitions/procedures/service/list.rb

@@ -16,12 +16,22 @@ module Procedures::Service
 
     def unit_files_list(services)
       if systemd_installed?
-        regex = services.map { |service| "^#{service.name}.service" }.join('\|')
-        execute("systemctl list-unit-files | grep '#{regex}'")
+        execute("systemctl list-unit-files --type=service | \
+                 grep '#{build_regex_for_services(services)}'")
       else
         regex = services.map { |service| "^#{service.name} " }.join('\|')
         execute("chkconfig --list 2>&1 | grep '#{regex}'")
       end
     end
+
+    def build_regex_for_services(services)
+      services.map do |service|
+        if service.respond_to?(:instance_parent_unit) && service.instance_parent_unit
+          "^#{service.instance_parent_unit}.service"
+        else
+          "^#{service.name}.service"
+        end
+      end.join('\|')
+    end
   end
 end

data/definitions/scenarios/backup.rb

@@ -94,6 +94,8 @@ module ForemanMaintain::Scenarios
                   Procedures::Backup::Snapshot::MountPulp => :skip)
       context.map(:tar_volume_size,
                   Procedures::Backup::Pulp => :tar_volume_size)
+      context.map(:include_db_dumps,
+                  Procedures::Backup::Online::SafetyConfirmation => :include_db_dumps)
     end
     # rubocop:enable  Metrics/MethodLength
 

data/definitions/scenarios/content.rb

@@ -20,16 +20,16 @@ module ForemanMaintain::Scenarios
       def enable_and_start_services
         add_step(Procedures::Service::Start)
         add_step(Procedures::Service::Enable.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
         add_step(Procedures::Service::Start.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
       end
 
       def disable_and_stop_services
         add_step(Procedures::Service::Stop.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
         add_step(Procedures::Service::Disable.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
       end
     end
 

data/lib/foreman_maintain/cli.rb

@@ -27,9 +27,8 @@ module ForemanMaintain
       subcommand 'content', 'Content related commands', ContentCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
-      if ::Scenarios.const_defined?('Satellite_6_10') &&
-         ForemanMaintain.detector.feature('satellite') &&
-         ForemanMaintain.detector.feature('satellite').current_minor_version == '6.9'
+      if ForemanMaintain.detector.feature(:satellite) &&
+         ForemanMaintain.detector.feature(:satellite).current_minor_version == '6.9'
         subcommand 'prep-6.10-upgrade', 'Preparations for the Satellite 6.10 upgrade' do
           def execute
             run_scenarios_and_exit(Scenarios::Prep610Upgrade.new)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -67,6 +67,7 @@ module ForemanMaintain
         end
       end
 
+      attr_accessor :select_option_counter
       attr_reader :last_line, :max_length
 
       def initialize(stdout = STDOUT, stdin = STDIN, options = {})
@@ -81,6 +82,7 @@ module ForemanMaintain
         @spinner = Spinner.new(self)
         @spinner.start_spinner if @stdout.tty?
         @last_line = ''
+        @select_option_counter = 0
       end
 
       def before_scenario_starts(scenario)
@@ -212,8 +214,10 @@ module ForemanMaintain
       # rubocop:disable Metrics/MethodLength
       def ask_to_select(message, steps, run_strategy)
         if assumeyes?
-          puts('(assuming first option)')
-          return steps.first
+          step = steps[@select_option_counter]
+          @select_option_counter += 1
+          puts("(assuming option #{@select_option_counter})")
+          return step
         end
 
         until_valid_decision do

data/lib/foreman_maintain/runner.rb

@@ -18,6 +18,7 @@ module ForemanMaintain
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
+      @procedure_step_counter = 0
     end
 
     def quit?
@@ -143,14 +144,16 @@ module ForemanMaintain
 
     # rubocop:disable  Metrics/MethodLength
     def ask_about_offered_steps(step, scenario)
-      if assumeyes? && rerun_check?(step)
-        @reporter.puts 'Check still failing after attempt to fix. Skipping'
-        return :no
-      end
       if step.next_steps && !step.next_steps.empty?
         @last_decision_step = step
+        @procedure_step_counter += 1
         steps = step.next_steps.map(&:ensure_instance)
-
+        if assumeyes? && @procedure_step_counter > steps.length
+          @procedure_step_counter = 0
+          @reporter.select_option_counter = 0
+          @reporter.puts 'Check still failing after attempt to fix. Skipping'
+          return :no
+        end
         decision = @reporter.on_next_steps(steps, scenario.run_strategy)
         case decision
         when :quit

data/lib/foreman_maintain/utils/service/systemd.rb

@@ -1,16 +1,17 @@
 module ForemanMaintain::Utils
   module Service
     class Systemd < Abstract
+      attr_reader :instance_parent_unit
       def initialize(name, priority, options = {})
         super
         @sys = SystemHelpers.new
+        @instance_parent_unit = options.fetch(:instance_parent_unit, nil)
       end
 
       def command(action, options = {})
         do_wait = options.fetch(:wait, true) # wait for service to start
         all = @options.fetch(:all, false)
         skip_enablement = @options.fetch(:skip_enablement, false)
-
         if skip_enablement && %w[enable disable].include?(action)
           return skip_enablement_message(action, @name)
         end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp