Merge pull request ManageIQ#15643 from jrafanie/allow_ansible_to_grac…

…efully_stop

Let ansible worker gracefully stop

app/models/embedded_ansible_worker.rb

@@ -2,6 +2,9 @@ class EmbeddedAnsibleWorker < MiqWorker
   require_nested :Runner
   include_concern 'ObjectManagement'
 
+  # Don't allow multiple ansible monitor workers to run at once
+  self.include_stopping_workers_on_synchronize = true
+
   self.required_roles = ['embedded_ansible']
 
   def start_runner
@@ -48,9 +51,6 @@ def find_worker_thread_object
     end
   end
 
-  alias terminate kill
-  alias stop kill
-
   def status_update
     # don't monitor the memory/cpu usage of this process yet
     # If we don't have a pid of a process we want to monitor,super will catch an Errno::ESRCH and abort the worker

spec/models/embedded_ansible_worker_spec.rb

@@ -161,27 +161,25 @@
       end
     end
 
-    %w(kill stop terminate).each do |stop_method|
-      describe "##{stop_method}" do
-        it "exits the monitoring thread and destroys the worker row" do
-          thread_double = double
-          expect(thread_double).to receive(:exit)
-          allow(subject).to receive(:find_worker_thread_object).and_return(thread_double)
-          subject.public_send(stop_method)
-          expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        end
-
-        it "destroys the worker row but refuses to kill the main thread" do
-          allow(subject).to receive(:find_worker_thread_object).and_return(Thread.main)
-          subject.public_send(stop_method)
-          expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        end
-
-        it "destroys the worker row if the monitor thread is not found" do
-          allow(subject).to receive(:find_worker_thread_object).and_return(nil)
-          subject.public_send(stop_method)
-          expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
-        end
+    describe "#kill" do
+      it "exits the monitoring thread and destroys the worker row" do
+        thread_double = double
+        expect(thread_double).to receive(:exit)
+        allow(subject).to receive(:find_worker_thread_object).and_return(thread_double)
+        subject.kill
+        expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it "destroys the worker row but refuses to kill the main thread" do
+        allow(subject).to receive(:find_worker_thread_object).and_return(Thread.main)
+        subject.kill
+        expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it "destroys the worker row if the monitor thread is not found" do
+        allow(subject).to receive(:find_worker_thread_object).and_return(nil)
+        subject.kill
+        expect { subject.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end