foreman_maintain 0.7.7 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2730a865433069746a18277ed6e484f907ee072cbed797a23cb24b079efeca9c
-  data.tar.gz: 8801e1447e2da1fb1aa170747e6cdc709aa5ea3280b2094fcf408e0cdc224488
+  metadata.gz: ae46ef9452f9bbb61d9f453a1d3aba399aa39aad83c8340ba2ba7129196eb6ec
+  data.tar.gz: daae5660ce5a676c230b6ef4360e7341f3fdb5d82ce46cc53a0ac3596926ab94
 SHA512:
-  metadata.gz: e3029fe3bc2144203923d9486bdbbb5d8be88babb17516af46c29a81f5faad416b5a1a0468ef9b0c3f8a998c93efddc793d0eb65a882f1c866c77d1ed19359de
-  data.tar.gz: 8a9f559d07c20a301ebbb3816fa42c49101ee0a4af5cbf7c1123753dc57c9053d86f28ed79862a1f77851c6b9b894c85b03ac72dde63121d53a1228a982f8183
+  metadata.gz: 62d82ea9a9d4ece0797e5872b8b0a551940864965416b23f3dfa7a7b054c68b8cd684d76f2cfd85532d6c744ab9f88942b03a8282a43aac96ae2282cb2a715ec
+  data.tar.gz: 00f495d544d54df325d9e0541a0b206dab5fbd2a2f5930e5d17eb86173d450e92926cc41c74379fda20a878ed634c8e473abfaf440d0034ae6c0c44e50c88fe5

data/definitions/features/service.rb

@@ -62,58 +62,48 @@ class Features::Service < ForemanMaintain::Feature
     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)
+      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

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/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.7'.freeze
+  VERSION = '0.7.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -418,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt