summaryrefslogtreecommitdiffstats
path: root/nova/scheduler/driver.py
diff options
context:
space:
mode:
authorHans Lindgren <hanlind@kth.se>2013-01-09 16:01:52 +0100
committerHans Lindgren <hanlind@kth.se>2013-01-22 22:55:47 +0100
commit3783cf3cc9c571beb9c75e5b0e39bf449520aaf3 (patch)
treecd36b4c8e885673fa0a1e19929a58232869bbb23 /nova/scheduler/driver.py
parentcd4093e0f2a7d07fa81915dc4866f4ac7324a028 (diff)
downloadnova-3783cf3cc9c571beb9c75e5b0e39bf449520aaf3.tar.gz
nova-3783cf3cc9c571beb9c75e5b0e39bf449520aaf3.tar.xz
nova-3783cf3cc9c571beb9c75e5b0e39bf449520aaf3.zip
Add support for memory overcommit in live-migration
Override the live-migration memory check in FilterScheduler and make it use RamFilter for checking available memory on target host. Resolves bug 1068258. Change-Id: I3002b8330e595ce71e2718b2091d3b0b99747707
Diffstat (limited to 'nova/scheduler/driver.py')
-rw-r--r--nova/scheduler/driver.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 09de10388..98d75076d 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -263,16 +263,9 @@ class Scheduler(object):
"""
# Getting total available memory of host
- avail = self._get_compute_info(context, dest)['memory_mb']
-
- # Getting total used memory and disk of host
- # It should be sum of memories that are assigned as max value,
- # because overcommitting is risky.
- instance_refs = db.instance_get_all_by_host(context, dest)
- used = sum([i['memory_mb'] for i in instance_refs])
+ avail = self._get_compute_info(context, dest)['free_ram_mb']
mem_inst = instance_ref['memory_mb']
- avail = avail - used
if not mem_inst or avail <= mem_inst:
instance_uuid = instance_ref['uuid']
reason = _("Unable to migrate %(instance_uuid)s to %(dest)s: "