shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #4913: Don't get stats when no VMs can be monitored. Revert two host with the same ref can be imported with different resource pools

Browse Source
This commit is contained in:
mcabrerizo 2017-04-26 08:11:56 +02:00
parent 6e32629087
commit 654143ced7
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vmm_mad/remotes/lib/vcenter_driver/host.rb
View File

@ -415,13 +415,15 @@ class ClusterComputeResource
max_samples = interval > 3600 ? 9 : samples
end
stats = pm.retrieve_stats(
vm_objects,
['net.transmitted','net.bytesRx','net.bytesTx','net.received',
'virtualDisk.numberReadAveraged','virtualDisk.numberWriteAveraged',
'virtualDisk.read','virtualDisk.write'],
{max_samples: max_samples}
)
if !vm_objects.empty?
stats = pm.retrieve_stats(
vm_objects,
['net.transmitted','net.bytesRx','net.bytesTx','net.received',
'virtualDisk.numberReadAveraged','virtualDisk.numberWriteAveraged',
'virtualDisk.read','virtualDisk.write'],
{max_samples: max_samples}
)
end
get_resource_pool_list if !@rp_list
@ -540,14 +542,7 @@ class ClusterComputeResource
one_cluster_id = -1 if !one_cluster_id
cluster_name = ""
if rp
cluster_name << cluster[:cluster_name] << "_#{rp.tr("/", "_")}"
else
cluster_name << cluster[:cluster_name]
end
rc = one_host.allocate(cluster_name, 'vcenter', 'vcenter', one_cluster_id.to_i)
rc = one_host.allocate(cluster[:cluster_name], 'vcenter', 'vcenter', one_cluster_id.to_i)
if OpenNebula.is_error?(rc)
raise "Could not allocate host: #{rc.message}"