mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-20 03:42:52 +09:00
F #4913: Avoid duplicate monitoring info B#5078. Replace RESOURCE_POOL with VCENTER_RESOURCE_POOL in monitor_resource_pools
This commit is contained in:
1 parent
752edca588
commit
e8c40e9db7
1 file changed
+7
-1
@@ -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"]
|
||||
|
||||
Reference in new issue
Block a user