foreman_maintain 0.8.24 → 0.8.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164031605ab91a858e8051175df3cfa485cb8d7641495649b56fc369c8f86901
-  data.tar.gz: 34bff6ed46469b2de1f936c4b9fb9a292e56f3fbef6084c0f2d9f84d7d5a8389
+  metadata.gz: b9456621c95c1feb4fdf10d4bd85cc22d2d22f667c9d8b227d7662c7575edc20
+  data.tar.gz: '09ae4ff692aac1550ade1264662014671c78a5890f007180a9f28e67a090f240'
 SHA512:
-  metadata.gz: bcce432d5b166c898ecfa33e2a215c8dde59011c72a9f356a877c16caad70da945e06742b4bf867f70963d095ca5520f0fd7aea38893c8ea28a183f08f45ba3f
-  data.tar.gz: b88af64fe1462a21f0f53c42ae8d67fd940208ccb2234af5ad043fd0ac0121726aec6b215d6b5fbe7dd3c747f1b8aa5f797953cab1b757dd69c7c2c51656a084
+  metadata.gz: d35101818f38bed03e8e08271fc1b73e34fb10b5db613bb094dac1d32d375f7e2b5061217e487a1130f78a35ac287b1ee49426d60af366c002b2d4f2ada81b4d
+  data.tar.gz: 4f00f5a90c9e3e3f9cf920136e78c276cccdc9b905b1dbb87453729a02aab8c25cbffcc961ea2f301e4f96825d0b4e2e814fcba11385bb0c4c37b7f952395c7e

data/definitions/features/foreman_tasks.rb

@@ -82,18 +82,22 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   def delete(state)
     tasks_condition = condition(state)
 
-    feature(:foreman_database).psql(<<-SQL)
-     BEGIN;
-       DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
-       DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
-       -- Delete locks and links which may now be orphaned
-       DELETE FROM foreman_tasks_locks as ftl where ftl.id NOT IN (SELECT id FROM foreman_tasks_tasks);
-       DELETE FROM foreman_tasks_links as ftl where ftl.id NOT IN (SELECT id FROM foreman_tasks_tasks);
-     COMMIT;
+    sql = <<-SQL
+      DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
+      DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
+      -- Delete locks and links which may now be orphaned
+      DELETE FROM foreman_tasks_locks as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
     SQL
 
+    if check_min_version(foreman_plugin_name('foreman-tasks'), '4.0.0')
+      sql += 'DELETE FROM foreman_tasks_links as ftl ' \
+             'where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);'
+    end
+
+    feature(:foreman_database).psql("BEGIN; #{sql}; COMMIT;")
+
     count(state)
   end
 

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -5,7 +5,9 @@ module Procedures::Installer
     end
 
     def run
-      execute!('foreman-rake upgrade:run')
+      # only run this in the Satellite scenario, as in others
+      # the installer runs this rake task for us already
+      execute!('foreman-rake upgrade:run') if feature(:satellite)
     end
   end
 end

data/definitions/procedures/pulp/remove.rb

@@ -23,7 +23,15 @@ module Procedures::Pulp
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
         '/var/cache/pulp'
-      ]
+      ].select { |dir| File.directory?(dir) }
+    end
+
+    def pulp_data_dirs_mountpoints
+      pulp_data_dirs.select { |d| Pathname(d).mountpoint? }
+    end
+
+    def deletable_pulp_dirs
+      @deletable_pulp_dirs ||= pulp_data_dirs - pulp_data_dirs_mountpoints
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -52,11 +60,12 @@ module Procedures::Pulp
       @installed_pulp_packages
     end
 
-    def data_dir_removal_cmds
-      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
+    def data_dir_removal_cmds(pulp_dirs)
+      pulp_dirs.map { |dir| "rm -rf #{dir}" }
     end
 
-    def ask_to_proceed(rm_cmds)
+    def ask_to_proceed
+      rm_cmds = data_dir_removal_cmds(pulp_data_dirs)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n"
       question += "\n# rpm -e #{pulp_packages.join('  ')}" if pulp_packages.any?
       question += "\n# yum remove rh-mongodb34-*"
@@ -69,11 +78,9 @@ module Procedures::Pulp
     end
 
     def run
-      rm_cmds = data_dir_removal_cmds
-
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
 
-      ask_to_proceed(rm_cmds) unless assumeyes_val
+      ask_to_proceed unless assumeyes_val
 
       remove_pulp if pulp_packages.any?
 
@@ -85,7 +92,7 @@ module Procedures::Pulp
 
       drop_migrations
 
-      delete_pulp_data(rm_cmds) if rm_cmds.any?
+      delete_pulp_data
 
       restart_pulpcore_services
     end
@@ -162,12 +169,41 @@ module Procedures::Pulp
     end
     # rubocop:enable Metrics/BlockLength
 
-    def delete_pulp_data(rm_cmds)
-      with_spinner('Deleting pulp2 data directories') do |spinner|
-        rm_cmds.each do |cmd|
-          execute!(cmd)
+    def delete_pulp_data
+      non_mountpoints = data_dir_removal_cmds(deletable_pulp_dirs)
+      mountpoints = pulp_data_dirs_mountpoints
+      with_spinner('') do |spinner|
+        if non_mountpoints.any?
+          spinner.update('Deleting pulp2 data directories.')
+          non_mountpoints.each do |cmd|
+            execute!(cmd)
+          end
+          msg_for_del_non_mountpoints(mountpoints, spinner)
+        end
+        if mountpoints.any?
+          msg_for_del_mountpoints(mountpoints, spinner)
         end
-        spinner.update('Done deleting pulp2 data directories')
+      end
+    end
+
+    def msg_for_del_non_mountpoints(mountpoints, spinner)
+      if mountpoints.empty?
+        spinner.update('Done deleting all pulp2 data directories.')
+      else
+        spinner.update("Deleted: #{deletable_pulp_dirs.join("\n")}")
+      end
+    end
+
+    def msg_for_del_mountpoints(mountpoints, spinner)
+      _, cmd_name = ForemanMaintain.pkg_and_cmd_name
+      if mountpoints.count > 1
+        spinner.update("The directories #{mountpoints.join(',')} are individual mountpoints.")
+        puts  "\nThe #{cmd_name} won't delete these directories.\n"\
+              'You need to remove content and these directories on your own.'
+      else
+        spinner.update("The directory #{mountpoints.join(',')} is individual mountpoint.")
+        puts  "\nThe #{cmd_name} won't delete the directory.\n"\
+              'You need to remove content and the directory on your own.'
       end
     end
 

data/definitions/scenarios/restore.rb

@@ -42,6 +42,8 @@ module ForemanMaintain::Scenarios
       add_steps_with_context(Procedures::Restore::RegenerateQueues) if backup.online_backup?
       add_steps_with_context(Procedures::Service::Start,
                              Procedures::Service::DaemonReload)
+      add_step(Procedures::Installer::Upgrade.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::UpgradeRakeTask)
       add_step_with_context(Procedures::Crond::Start) if feature(:cron)
     end
     # rubocop:enable Metrics/MethodLength,Metrics/AbcSize

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.24'.freeze
+  VERSION = '0.8.27'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.27
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp