diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-11-01 15:53:27 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2012-11-06 19:54:44 +0000 |
| commit | b84b7daaf83b8280d4a80ca00c4d5e3783a162db (patch) | |
| tree | 8038d26d28dae83f06757daa92573f104dfd262f /nova/api | |
| parent | 66a6fdd73f8fd095fa212f515407fd64fdbf805f (diff) | |
| download | nova-b84b7daaf83b8280d4a80ca00c4d5e3783a162db.tar.gz nova-b84b7daaf83b8280d4a80ca00c4d5e3783a162db.tar.xz nova-b84b7daaf83b8280d4a80ca00c4d5e3783a162db.zip | |
Fix quota updating during soft delete and restore
Fixes bug 1075716
Quotas were not properly updated when soft deletes were enabled. This
patch fixes quotas for soft deletes and restores.
Change-Id: I77fd3ff76caa9eba3e2180c1abcfb390ea7857d6
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/deferred_delete.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/deferred_delete.py b/nova/api/openstack/compute/contrib/deferred_delete.py index 8eaea04bb..ea7ac00f9 100644 --- a/nova/api/openstack/compute/contrib/deferred_delete.py +++ b/nova/api/openstack/compute/contrib/deferred_delete.py @@ -42,6 +42,9 @@ class DeferredDeleteController(wsgi.Controller): instance = self.compute_api.get(context, id) try: self.compute_api.restore(context, instance) + except exception.QuotaError as error: + raise exc.HTTPRequestEntityTooLarge(explanation=unicode(error), + headers={'Retry-After': 0}) except exception.InstanceInvalidState as state_error: common.raise_http_conflict_for_instance_invalid_state(state_error, 'restore') |