x/terracotta
Code Issues Proposed changes

Modified vms_ram_limit to skip deleted VMs

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-09 16:50:44 +11:00
parent 4f53cd14fb
commit 18c5a2246a
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
neat/globals/manager.py
View File

@ -316,6 +316,16 @@ def execute_underload(config, state, host):
vms_cpu = dict((x, vms_last_cpu[x]) for x in vms_to_migrate)
vms_ram = vms_ram_limit(state['nova'], vms_to_migrate)
# Remove VMs that are not in vms_ram
# These instances might have been deleted
for i, vm in enumerate(vms_to_migrate):
if not vm in vms_ram:
del vms_to_migrate[i]
for vm in vms_cpu.keys():
if not vm in vms_ram:
del vms_cpu[i]
time_step = int(config['data_collector_interval'])
migration_time = common.calculate_migration_time(
vms_ram,
@ -390,8 +400,14 @@ def vms_ram_limit(nova, vms):
:rtype: dict(str: int)
"""
flavors_to_ram = flavors_ram(nova)
return dict((uuid, flavors_to_ram[nova.servers.get(uuid).flavor['id']])
for uuid in vms)
vms_ram = {}
for uuid in vms:
try:
vm = nova.servers.get(uuid)
vms_ram[uuid] = flavors_to_ram[vm.flavor['id']]
except novaclient.exceptions.NotFound:
pass
return vms_ram
@contract
@ -518,6 +534,16 @@ def execute_overload(config, state, vm_uuids):
vms_cpu = dict((x, vms_last_cpu[x]) for x in vms_to_migrate)
vms_ram = vms_ram_limit(state['nova'], vms_to_migrate)
# Remove VMs that are not in vms_ram
# These instances might have been deleted
for i, vm in enumerate(vms_to_migrate):
if not vm in vms_ram:
del vms_to_migrate[i]
for vm in vms_cpu.keys():
if not vm in vms_ram:
del vms_cpu[i]
time_step = int(config['data_collector_interval'])
migration_time = common.calculate_migration_time(
vms_ram,