diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-27 00:40:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-27 00:40:26 +0000 |
| commit | 907594ec28193a1ba9fdaf7420b153433e7ea47b (patch) | |
| tree | 5ed1881495d814ca7d1cc68ae50ace1d7861b285 | |
| parent | 7414e5137fca92389267f5362a713b566311cadc (diff) | |
| parent | 6e9a2f42616859963034bab6c21c793f05a5ba8d (diff) | |
| download | nova-907594ec28193a1ba9fdaf7420b153433e7ea47b.tar.gz nova-907594ec28193a1ba9fdaf7420b153433e7ea47b.tar.xz nova-907594ec28193a1ba9fdaf7420b153433e7ea47b.zip | |
Merge "Retry floating_ip_fixed_ip_associate on deadlock."
| -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 9efdc47f1..f26d67cac 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -744,6 +744,7 @@ def floating_ip_count_by_project(context, project_id, session=None): @require_context +@_retry_on_deadlock def floating_ip_fixed_ip_associate(context, floating_address, fixed_address, host): session = get_session() |