x/terracotta
Code Issues Proposed changes

Added a check for non-empty CPU data in best_fit_decreasing

Browse Source
This commit is contained in:
Anton Beloglazov 2015-04-01 22:33:54 +11:00
parent 76bdaf2d31
commit 999a28bc34
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neat/globals/vm_placement/bin_packing.py
View File

@ -120,10 +120,14 @@ def best_fit_decreasing(last_n_vm_cpu, hosts_cpu, hosts_ram,
log.debug('vms_ram: %s', str(vms_ram)) log.debug('vms_ram: %s', str(vms_ram))
vms_tmp = [] vms_tmp = []
for vm, cpu in vms_cpu.items(): for vm, cpu in vms_cpu.items():
if cpu:
last_n_cpu = cpu[-last_n_vm_cpu:] last_n_cpu = cpu[-last_n_vm_cpu:]
vms_tmp.append((sum(last_n_cpu) / len(last_n_cpu), vms_tmp.append((sum(last_n_cpu) / len(last_n_cpu),
vms_ram[vm], vms_ram[vm],
vm)) vm))
else:
log.warning('No CPU data for VM: %s - skipping', vm)
vms = sorted(vms_tmp, reverse=True) vms = sorted(vms_tmp, reverse=True)
hosts = sorted(((v, hosts_ram[k], k) hosts = sorted(((v, hosts_ram[k], k)
for k, v in hosts_cpu.items())) for k, v in hosts_cpu.items()))