From 14ee97b4e47ca1e2282cf98f9d0649d790bf061a Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@redhat.com>
Date: Thu, 23 Feb 2017 12:06:08 -0500
Subject: [PATCH] Rely on 10 minute starting_timeout instead of a heartbeating
 thread

The server process allows "starting" workers up to 10 minutes to start
before marking them as not responding.  We can use this starting_timeout
instead of heartbeating in a thread while another thread runs the
ansible setup playbook (configure).
---
 app/models/embedded_ansible_worker/runner.rb | 32 +++++++++-----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/app/models/embedded_ansible_worker/runner.rb b/app/models/embedded_ansible_worker/runner.rb
index 1246403d45a..784b58be664 100644
--- a/app/models/embedded_ansible_worker/runner.rb
+++ b/app/models/embedded_ansible_worker/runner.rb
@@ -1,30 +1,28 @@
 class EmbeddedAnsibleWorker::Runner < MiqWorker::Runner
-  def prepare
-    Thread.new do
-      setup_ansible
-      started_worker_record
-    end
+  self.wait_for_worker_monitor = false
 
+  def prepare
+    # Override prepare so we don't get set as started
     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
-      _log.info("waiting for ansible to start...")
-      loop do
-        # handle if the ansible setup blew up or timed out
-        break if worker.reload.started?
-        heartbeat
-        send(poll_method)
-      end
+      begin
+        setup_ansible
+        started_worker_record
 
-      update_embedded_ansible_provider
+        update_embedded_ansible_provider
 
-      _log.info("entering ansible monitor loop")
-      loop do
-        do_work
-        send(poll_method)
+        _log.info("entering ansible monitor loop")
+        loop do
+          do_work
+          send(poll_method)
+        end
+      rescue => err
+        _log.log_backtrace(err)
+        do_exit
       end
     end
   end