Remove return value from sync_workers and friends

Author: agrare

app/models/miq_server/worker_management.rb

@@ -5,7 +5,7 @@ class MiqServer::WorkerManagement
   include Heartbeat
   include Monitor
 
-  attr_reader :my_server
+  attr_reader :my_server, :workers
 
   def self.build(my_server)
     klass = if podified?

app/models/miq_server/worker_management/kubernetes.rb

@@ -21,19 +21,15 @@ def sync_from_system
   end
 
   def sync_starting_workers
-    starting = MiqWorker.find_all_starting.to_a
-    starting.each do |worker|
+    MiqWorker.find_all_starting.each do |worker|
       next if worker.class.rails_worker?
 
       worker_pod = get_pod(worker[:system_uid])
       container_status = worker_pod.status.containerStatuses.find { |container| container.name == worker.worker_deployment_name }
       if worker_pod.status.phase == "Running" && container_status.ready && container_status.started
         worker.update!(:status => "started")
-        starting.delete(worker)
       end
     end
-
-    starting
   end
 
   def enough_resource_to_start_worker?(_worker_class)

app/models/miq_server/worker_management/monitor.rb

@@ -38,9 +38,9 @@ def worker_not_responding(w)
   end
 
   def sync_workers
-    MiqWorkerType.worker_classes.each_with_object({}) do |klass, result|
-      result[klass.name] = klass.sync_workers
-      result[klass.name][:adds].each { |pid| worker_add(pid) unless pid.nil? }
+    MiqWorkerType.worker_classes.each do |klass|
+      result = klass.sync_workers
+      result[:adds].each { |pid| worker_add(pid) unless pid.nil? }
     rescue => error
       _log.error("Failed to sync_workers for class: #{klass.name}: #{error}")
       _log.log_backtrace(error)

app/models/miq_server/worker_management/systemd.rb

@@ -5,21 +5,17 @@ def sync_from_system
   end
 
   def sync_starting_workers
-    starting = MiqWorker.find_all_starting.to_a
     sync_from_system
-    starting.each do |worker|
+    MiqWorker.find_all_starting.each do |worker|
       next if worker.class.rails_worker?
 
       systemd_worker = miq_services_by_unit[worker[:system_uid]]
       next if systemd_worker.nil?
 
       if systemd_worker[:load_state] == "loaded" && systemd_worker[:active_state] == "active" && systemd_worker[:sub_state] == "running"
-        worker.update!(:status => "started")
-        starting.delete(worker)
+        worker.update!(:status => MiqWorker::STATUS_STARTED)
       end
     end
-
-    starting
   end
 
   def cleanup_failed_workers

spec/models/miq_server/worker_management/monitor_spec.rb

@@ -40,7 +40,10 @@
         allow(MiqWorkerType).to receive(:worker_class_names).and_return(%w[MiqGenericWorker MiqPriorityWorker])
         allow(MiqGenericWorker).to receive(:sync_workers).and_raise
         expect(MiqPriorityWorker).to receive(:sync_workers).and_return(:adds => [123])
-        expect(server.worker_manager.sync_workers).to eq("MiqPriorityWorker"=>{:adds=>[123]})
+
+        server.worker_manager.sync_workers
+
+        expect(server.worker_manager.workers.keys).to include(12345, 123)
       end
     end
   end