summaryrefslogtreecommitdiffstats
path: root/nova/quota.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-21 20:23:45 +0000
committerGerrit Code Review <review@openstack.org>2013-06-21 20:23:45 +0000
commitb7659482c49a83631214ddd72f8377da32b48ec7 (patch)
tree557d25db8157812195ea2d24e7b37c41c8bc37c0 /nova/quota.py
parentdc23e94342020f548773dcf38afb6acd0848c8c5 (diff)
parent65a5bf49082dbf0318fd578be584618b80d0fbcf (diff)
downloadnova-b7659482c49a83631214ddd72f8377da32b48ec7.tar.gz
nova-b7659482c49a83631214ddd72f8377da32b48ec7.tar.xz
nova-b7659482c49a83631214ddd72f8377da32b48ec7.zip
Merge "Fix quota logging on exceptions"
Diffstat (limited to 'nova/quota.py')
-rw-r--r--nova/quota.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/quota.py b/nova/quota.py
index a1c877ecc..d0241de1c 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -993,6 +993,7 @@ class QuotaEngine(object):
# logged, however, because this is less than optimal.
LOG.exception(_("Failed to commit reservations "
"%(reservations)s") % locals())
+ return
LOG.debug(_("Committed reservations %(reservations)s") % locals())
def rollback(self, context, reservations, project_id=None):
@@ -1015,6 +1016,7 @@ class QuotaEngine(object):
# logged, however, because this is less than optimal.
LOG.exception(_("Failed to roll back reservations "
"%(reservations)s") % locals())
+ return
LOG.debug(_("Rolled back reservations %(reservations)s") % locals())
def usage_reset(self, context, resources):