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

bug #2179: Fix for Host & VM CPU monitoring for VMware

Browse Source 
VM CPU % - percentage of requested CPUs used (max 100%)
HOST CPU % - percentage of available CPUs used (max 100*numCPUs%)
(cherry picked from commit decccf80fbc75eadcd33a0afa9bb980673b922e5)
This commit is contained in:
Tino Vazquez 2013-07-22 16:58:14 +02:00
parent 81cb412429
commit 545b132c33
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/vmm_mad/remotes/vmware/vi_driver.rb
View File

@ -249,27 +249,26 @@ class VIVm
return
end
host = VIDriver::host
cpuMhz = host.cpuMhz.to_f
numCpuCores = host.numCpuCores.to_f
@used_cpu= (@summary.quickStats.overallCpuUsage.to_f /
(cpuMhz * numCpuCores)).round()
@used_memory = @summary.quickStats.hostMemoryUsage * 1024
net = VIDriver::retrieve_stats([@vm],
["net.packetsRx","net.packetsTx"])
@net_rx = 0
@net_tx = 0
host = VIDriver::host
cpuMhz = host.cpuMhz.to_f
@used_cpu =
((@summary.quickStats.overallCpuUsage.to_f / cpuMhz) * 100).to_s
@used_cpu = sprintf('%.2f',@used_cpu).to_s
if net[@vm] && net[@vm][:metrics]
if net[@vm][:metrics]["net.packetsRx"]
@net_rx = net[@vm][:metrics]["net.packetsRx"].first
vm_stats = VIDriver::retrieve_stats([@vm],
["net.packetsRx","net.packetsTx"])
@net_rx = 0
@net_tx = 0
if vm_stats[@vm] && vm_stats[@vm][:metrics]
if vm_stats[@vm][:metrics]["net.packetsRx"]
@net_rx = vm_stats[@vm][:metrics]["net.packetsRx"].first
end
if net[@vm][:metrics]["net.packetsTx"]
@net_tx = net[@vm][:metrics]["net.packetsTx"].first
if vm_stats[@vm][:metrics]["net.packetsTx"]
@net_tx = vm_stats[@vm][:metrics]["net.packetsTx"].first
end
end
end
@ -336,11 +335,10 @@ class VIHost
@cpuModel = hardware.cpuModel
@cpuMhz = hardware.cpuMhz
@numCpuCores = hardware.numCpuCores
@total_cpu = hardware.numCpuCores*100
@used_cpu = (stats.overallCpuUsage.to_f /
(@cpuMhz.to_f * @numCpuCores.to_f)).round()
@used_cpu = (stats.overallCpuUsage.to_f / @cpuMhz.to_f) * 100
@used_cpu = sprintf('%.2f', @used_cpu).to_f # Trim precission
@total_memory = hardware.memorySize/1024
@used_memory = stats.overallMemoryUsage*1024