Remove broker references

ManageIQ · Jan 24, 2020 · 395a1d4 · 395a1d4
1 parent 5849004
commit 395a1d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/app/models/job_proxy_dispatcher.rb b/app/models/job_proxy_dispatcher.rb
@@ -23,8 +23,6 @@ def dispatch
 
       # Skip work if there are no jobs to dispatch
       if jobs_to_dispatch.length > 0
-        logged_broker_unavailable = false
-
         Benchmark.realtime_block(:active_vm_scans) { active_vm_scans_by_zone }
         Benchmark.realtime_block(:busy_proxies) { busy_proxies }
         Benchmark.realtime_block(:busy_resources_for_embedded_scanning) { busy_resources_for_embedded_scanning }

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
@@ -438,12 +438,8 @@ def self.task_arguments(options)
   private_class_method :task_arguments
 
   def powerops_callback(task_id, status, msg, result, queue_item)
-    if queue_item.last_exception.kind_of?(MiqException::MiqVimBrokerUnavailable)
-      queue_item.requeue(:deliver_on => 1.minute.from_now.utc)
-    else
-      task = MiqTask.find_by(:id => task_id)
-      task.queue_callback("Finished", status, msg, result) if task
-    end
+    task = MiqTask.find_by(:id => task_id)
+    task.queue_callback("Finished", status, msg, result) if task
   end
 
   # override