x/terracotta
Code Issues Proposed changes

Fixed a bug: continue -> break; updated execute_overload

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-24 18:12:03 +11:00
parent 120129887a
commit e54d13d803
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
neat/globals/manager.py
View File

@ -463,8 +463,14 @@ def execute_overload(config, state, vm_uuids):
host_cpu_mhz = hosts_last_cpu[host]
for vm in vms:
if vm not in vms_last_cpu:
log.info('No data yet for VM: %s - dropping the request', vm)
return state
log.info('No data yet for VM: %s - skipping host %s', vm, host)
del hosts_cpu_total[host]
del hosts_ram_total[host]
if host in hosts_cpu_usage:
del hosts_cpu_usage[host]
if host in hosts_ram_usage:
del hosts_ram_usage[host]
break
host_cpu_mhz += vms_last_cpu[vm]
hosts_cpu_usage[host] = host_cpu_mhz
hosts_ram_usage[host] = host_used_ram(state['nova'], host)
@ -474,6 +480,10 @@ def execute_overload(config, state, vm_uuids):
del hosts_cpu_total[host]
del hosts_ram_total[host]
if log.isEnabledFor(logging.DEBUG):
log.debug('Host CPU usage: %s', str(hosts_last_cpu))
log.debug('Host total CPU usage: %s', str(hosts_cpu_usage))
vms_to_migrate = vm_uuids
vms_cpu = {}
for vm in vms_to_migrate: