Merge pull request #14256 from jrafanie/move_embedded_ansible_worker_…

…thread_up

Move embedded ansible worker thread up to start_runner

app/models/embedded_ansible_worker.rb

@@ -4,8 +4,18 @@ class EmbeddedAnsibleWorker < MiqWorker
   self.required_roles = ['embedded_ansible']
 
   def start_runner
-    self.class::Runner.start_worker(worker_options)
-    # TODO: return supervisord pid
+    Thread.new do
+      begin
+        self.class::Runner.start_worker(worker_options)
+        # TODO: return supervisord pid
+      rescue SystemExit
+        # Because we're running in a thread on the Server
+        # we need to intercept SystemExit and exit our thread,
+        # not the main server thread!
+        log.info("#{log_prefix} SystemExit received, exiting monitoring Thread")
+        Thread.exit
+      end
+    end
   end
 
   def kill

app/models/embedded_ansible_worker/runner.rb

@@ -2,29 +2,31 @@ class EmbeddedAnsibleWorker::Runner < MiqWorker::Runner
   self.wait_for_worker_monitor = false
 
   def prepare
-    # Override prepare so we don't get set as started
+    ObjectSpace.garbage_collect
+    # Overriding prepare so we can set started when we're ready
+    do_before_work_loop
+    started_worker_record
     self
   end
 
-  # This thread runs forever until a stop request is received, which with send us to do_exit to exit our thread
-  def do_work_loop
-    Thread.new do
-      begin
-        setup_ansible
-        started_worker_record
+  def do_before_work_loop
+    setup_ansible
+    update_embedded_ansible_provider
+  rescue => err
+    _log.log_backtrace(err)
+    do_exit(err.message, 1)
+  end
+
+  def heartbeat
+    super if EmbeddedAnsible.alive?
+  end
 
-        update_embedded_ansible_provider
+  def do_work
+    EmbeddedAnsible.start if !EmbeddedAnsible.alive? && !EmbeddedAnsible.running?
+  end
 
-        _log.info("entering ansible monitor loop")
-        loop do
-          do_work
-          send(poll_method)
-        end
-      rescue => err
-        _log.log_backtrace(err)
-        do_exit
-      end
-    end
+  def before_exit(*_)
+    EmbeddedAnsible.disable
   end
 
   def setup_ansible
@@ -36,26 +38,6 @@ def setup_ansible
     _log.info("calling EmbeddedAnsible.start finished")
   end
 
-  def do_work
-    if EmbeddedAnsible.alive?
-      heartbeat
-    else
-      EmbeddedAnsible.start unless EmbeddedAnsible.running?
-    end
-  end
-
-  # Because we're running in a thread on the Server
-  # we need to intercept SystemExit and exit our thread,
-  # not the main server thread!
-  def do_exit(*args)
-    # ensure this doesn't fail or that we can still get to the super call
-    EmbeddedAnsible.disable
-    super
-  rescue SystemExit
-    _log.info("#{log_prefix} SystemExit received, exiting monitoring Thread")
-    Thread.exit
-  end
-
   def update_embedded_ansible_provider
     server   = MiqServer.my_server(true)
     provider = ManageIQ::Providers::EmbeddedAnsible::Provider.first_or_initialize

config/settings.yml

@@ -1206,6 +1206,7 @@
       :starting_timeout: 10.minutes
       :stopping_timeout: 10.minutes
     :embedded_ansible_worker:
+      :starting_timeout: 20.minutes
       :poll: 10.seconds
       :memory_threshold: 0.megabytes
     :ems_refresh_core_worker:

spec/models/embedded_ansible_worker/runner_spec.rb

@@ -13,6 +13,13 @@
       described_class.new(:guid => worker_guid)
     }
 
+    it "#do_before_work_loop exits on exceptions" do
+      expect(runner).to receive(:setup_ansible)
+      expect(runner).to receive(:update_embedded_ansible_provider).and_raise(StandardError)
+      expect(runner).to receive(:do_exit)
+      runner.do_before_work_loop
+    end
+
     context "#update_embedded_ansible_provider" do
       before do
         EvmSpecHelper.local_guid_miq_server_zone