From e8c40e9db7ee7e488c394e14abdc74b6da67d175 Mon Sep 17 00:00:00 2001 From: mcabrerizo Date: Sun, 2 Apr 2017 19:39:54 +0200 Subject: [PATCH] F #4913: Avoid duplicate monitoring info B#5078. Replace RESOURCE_POOL with VCENTER_RESOURCE_POOL in monitor_resource_pools --- src/vmm_mad/remotes/lib/vcenter_driver/host.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb index 92a2a1c148..3deb0ec87e 100644 --- a/src/vmm_mad/remotes/lib/vcenter_driver/host.rb +++ b/src/vmm_mad/remotes/lib/vcenter_driver/host.rb @@ -150,7 +150,7 @@ class ClusterComputeResource rp_name = (parent_prefix.empty? ? "" : parent_prefix + "/") rp_name += rp.name - rp_info << "\nRESOURCE_POOL = [" + rp_info << "\nVCENTER_RESOURCE_POOL = [" rp_info << "NAME=\"#{rp_name}\"," rp_info << "CPU_EXPANDABLE=#{cpu_expandable}," rp_info << "CPU_LIMIT=#{cpu_limit}," @@ -211,6 +211,7 @@ class ClusterComputeResource def monitor_vms str_info = "" + @monitored_vms = Set.new resource_pools.each do |rp| str_info << monitor_vms_in_rp(rp) end @@ -258,6 +259,11 @@ class ClusterComputeResource number = extraconfig_vmid[0][:value] end + if number != -1 + next if @monitored_vms.include? number + @monitored_vms << number + end + vm.monitor next if !vm["config"]