Use #stop_container to stop containerized workers

ManageIQ · Dec 8, 2017 · 29166d4 · 29166d4
1 parent f0af72f
commit 29166d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/models/miq_server/worker_management/monitor/stop.rb b/app/models/miq_server/worker_management/monitor/stop.rb
@@ -37,7 +37,9 @@ def stop_worker(worker, monitor_status = :waiting_for_stop, monitor_reason = nil
     worker_set_monitor_status(w.pid, monitor_status)
     worker_set_monitor_reason(w.pid, monitor_reason)
 
-    if w.respond_to?(:terminate)
+    if w.containerized_worker?
+      w.stop_container
+    elsif w.respond_to?(:terminate)
       w.terminate
     else
       w.update_attributes(:status => MiqWorker::STATUS_STOPPING)

diff --git a/app/models/miq_worker.rb b/app/models/miq_worker.rb
@@ -357,6 +357,10 @@ def self.containerized_worker?
     MiqEnvironment::Command.is_container? && supports_container?
   end
 
+  def containerized_worker?
+    self.class.containerized_worker?
+  end
+
   def start_runner
     if ENV['MIQ_SPAWN_WORKERS'] || !Process.respond_to?(:fork)
       start_runner_via_spawn