Merge pull request #379 from fdupont-redhat/v2v_fix_transformation_ho…

…st_selection Fix transformation host selection
ManageIQ · Jul 30, 2018 · b2982c6 · b2982c6
2 parents c38ef4b + 70f5df7
commit b2982c6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 15 deletions.
diff --git a/...nt/automate/ManageIQ/Transformation/TransformationHosts/Common.class/__methods__/utils.rb b/...nt/automate/ManageIQ/Transformation/TransformationHosts/Common.class/__methods__/utils.rb
@@ -4,18 +4,26 @@ module Transformation
       module TransformationHosts
         module Common
           class Utils
-            def initialize(handle = $evm)
-              @debug = true
-              @handle = handle
-            end
-
-            def main
-            end
+            DEFAULT_EMS_MAX_RUNNERS = 10
+            DEFAULT_HOST_MAX_RUNNERS = 10
 
             def self.get_runners_count_by_host(host, handle = $evm)
               handle.vmdb(:service_template_transformation_plan_task).where(:state => 'active').select { |task| task.get_option(:transformation_host_id) == host.id }.size
             end
 
+            def self.host_max_runners(host, factory_config, max_runners = DEFAULT_HOST_MAX_RUNNERS, handle = $evm)
+              if host.custom_get('Max Transformation Runners')
+                handle.log(:info, "Using max transformation runners from host custom attribute: #{host.custom_get('Max Transformation Runners')}")
+                host.custom_get('Max Transformation Runners').to_i
+              elsif factory_config['transformation_host_max_runners']
+                handle.log(:info, "Using max transformation runners from factory config: #{factory_config['transformation_host_max_runners']}")
+                factory_config['transformation_host_max_runners'].to_i
+              else
+                handle.log(:info, "Using default max transformation runners: #{max_runners}")
+                max_runners
+              end
+            end
+
             def self.transformation_hosts(ems, factory_config)
               thosts = []
               ems.hosts.each do |host|
@@ -26,7 +34,7 @@ def self.transformation_hosts(ems, factory_config)
                   :host                  => host,
                   :runners               => {
                     :current => get_runners_count_by_host(host),
-                    :maximum => host.custom_get('Max Transformation Runners') || factory_config['transformation_host_max_runners'] || 10
+                    :maximum => host_max_runners(host, factory_config)
                   }
                 }
               end
@@ -41,11 +49,23 @@ def self.get_runners_count_by_ems(ems, factory_config)
               transformation_hosts(ems, factory_config).inject(0) { |sum, thost| sum + thost[:runners][:current] }
             end
 
+            def self.ems_max_runners(ems, factory_config, max_runners = DEFAULT_EMS_MAX_RUNNERS, handle = $evm)
+              if ems.custom_get('Max Transformation Runners')
+                handle.log(:info, "Using max transformation runners from EMS custom attribute: #{ems.custom_get('Max Transformation Runners')}")
+                ems.custom_get('Max Transformation Runners').to_i
+              elsif factory_config['ems_max_runners']
+                handle.log(:info, "Using max transformation runners from factory config: #{factory_config['ems_max_runners']}")
+                factory_config['ems_max_runners'].to_i
+              else
+                handle.log(:info, "Using default max transformation runners: #{max_runners}")
+                max_runners
+              end
+            end
+
             def self.get_transformation_host(task, factory_config, handle = $evm)
               ems = handle.vmdb(:ext_management_system).find_by(:id => task.get_option(:destination_ems_id))
-              ems_max_runners = ems.custom_get('Max Transformation Runners').to_i || factory_config['ems_max_runners'] || 1
               ems_cur_runners = get_runners_count_by_ems(ems, factory_config)
-              transformation_host_hash = ems_cur_runners < ems_max_runners ? eligible_transformation_hosts(ems, factory_config).first : {}
+              transformation_host_hash = ems_cur_runners < ems_max_runners(ems, factory_config) ? eligible_transformation_hosts(ems, factory_config).first : {}
               return transformation_host_hash[:type], transformation_host_hash[:host], transformation_host_hash[:transformation_method]
             end
 
@@ -118,7 +138,3 @@ def self.virtv2vwrapper_options_vmwarews2rhevm_ssh(task)
     end
   end
 end
-
-if $PROGRAM_NAME == __FILE__
-  ManageIQ::Automate::Transformation::TransformationHosts::Common::Utils.new.main
-end
diff --git a/...omate/ManageIQ/Transformation/TransformationHosts/Common.class/__methods__/vmtransform.rb b/...omate/ManageIQ/Transformation/TransformationHosts/Common.class/__methods__/vmtransform.rb
@@ -32,7 +32,7 @@ def main
               @handle.log(:info, "Transformation - Started On: #{start_timestamp}")
 
               destination_ems = @handle.vmdb(:ext_management_system).find_by(:id => task.get_option(:destination_ems_id))
-              max_runners = destination_ems.custom_get('Max Transformation Runners').to_i || factory_config['max_transformation_runners_by_ems'] || 10
+              max_runners = Transformation::TransformationHosts::Common::Utils.ems_max_runners(destination_ems, factory_config)
               if Transformation::TransformationHosts::Common::Utils.get_runners_count_by_ems(destination_ems, factory_config) >= max_runners
                 @handle.log(:info, "Too many transformations running [#{max_runners}]. Retrying.")
               else