summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Laski <andrew.laski@rackspace.com>2013-04-02 19:24:35 -0400
committerAndrew Laski <andrew.laski@rackspace.com>2013-04-02 20:47:04 -0400
commita574af21f81e12ea5fd48ad50bd0535d08fcda24 (patch)
tree25bb4c3d04658e8076acb767ea7ce1520403f773
parent4810b5ad9380d2dd19b098296087459face21e5f (diff)
downloadnova-a574af21f81e12ea5fd48ad50bd0535d08fcda24.tar.gz
nova-a574af21f81e12ea5fd48ad50bd0535d08fcda24.tar.xz
nova-a574af21f81e12ea5fd48ad50bd0535d08fcda24.zip
Grab instance for migration before updating usage
Updates _update_usage_from_migrations so that it grabs the instance associated with a migration before updating usage. Bug 1163622 Change-Id: I64acef912ae71ea5c7fb66e9fcaafe5750c63eaf
-rw-r--r--nova/compute/resource_tracker.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py
index fab64017d..69b5eb61f 100644
--- a/nova/compute/resource_tracker.py
+++ b/nova/compute/resource_tracker.py
@@ -458,6 +458,7 @@ class ResourceTracker(object):
filtered[uuid] = migration
for migration in filtered.values():
+ instance = migration['instance']
try:
self._update_usage_from_migration(instance, resources,
migration)