diff options
author | Jenkins <jenkins@review.openstack.org> | 2013-06-26 21:44:22 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2013-06-26 21:44:22 +0000 |
commit | cda758f89910f5299eceff033acc491dd656b013 (patch) | |
tree | e72a66f592dc8262f4a7c1749322045678f40e67 | |
parent | d62e708889498cd22e633d99c40655be82b97c9a (diff) | |
parent | c0ca847286b88f37e3b4cb6b394fced4b60ed06f (diff) | |
download | nova-cda758f89910f5299eceff033acc491dd656b013.tar.gz nova-cda758f89910f5299eceff033acc491dd656b013.tar.xz nova-cda758f89910f5299eceff033acc491dd656b013.zip |
Merge "Retry quota_reserve on DBDeadlock"
-rw-r--r-- | nova/db/sqlalchemy/api.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index b6fc19af0..9e0f8f7e0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -2788,6 +2788,7 @@ def _get_quota_usages(context, session, project_id): @require_context +@_retry_on_deadlock def quota_reserve(context, resources, quotas, deltas, expire, until_refresh, max_age, project_id=None): elevated = context.elevated() |