diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-12 00:55:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-12 00:55:49 +0000 |
| commit | ae251b99a3fb6aa99ec8898152d79dfa2c026a92 (patch) | |
| tree | 430637af63709c723ccdbb943fec2b5b35e1df96 /nova/compute | |
| parent | 67069a3d1a4174fae987c8e3a7091b6fd37ff606 (diff) | |
| parent | d8d7d148fe2c185f2efda0c4cfc2ca125d4008d7 (diff) | |
Merge "Pass migration_ref when when auto-confirming"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 7 | ||||
| -rwxr-xr-x | nova/compute/manager.py | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 0603b929d..2a63b63a5 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1848,11 +1848,12 @@ class API(base.Base): @wrap_check_policy @check_instance_lock @check_instance_state(vm_state=[vm_states.RESIZED]) - def confirm_resize(self, context, instance): + def confirm_resize(self, context, instance, migration_ref=None): """Confirms a migration/resize and deletes the 'old' instance.""" elevated = context.elevated() - migration_ref = self.db.migration_get_by_instance_and_status(elevated, - instance['uuid'], 'finished') + if migration_ref is None: + migration_ref = self.db.migration_get_by_instance_and_status( + elevated, instance['uuid'], 'finished') # reserve quota only for any decrease in resource usage deltas = self._downsize_quota_delta(context, migration_ref) diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 5288ba6b9..53ab3a2ed 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3322,7 +3322,8 @@ class ComputeManager(manager.SchedulerDependentManager): instance=instance) continue try: - self.compute_api.confirm_resize(context, instance) + self.compute_api.confirm_resize(context, instance, + migration_ref=migration) except Exception, e: msg = _("Error auto-confirming resize: %(e)s. " "Will retry later.") |