openstack
/
octavia
Code Issues Proposed changes

Merge "Fix allocate_and_associate DB deadlock"

This commit is contained in:
Zuul 2019-06-15 02:08:29 +00:00 committed by Gerrit Code Review
parent 41e7cfa09f 0eaab450c1
commit acf551c0bd
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
octavia/db/repositories.py
View File

@ -1137,6 +1137,7 @@ class AmphoraRepository(BaseRepository):
id=amphora_id).first()
load_balancer.amphorae.append(amphora)
@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
def allocate_and_associate(self, session, load_balancer_id):
"""Allocate an amphora for a load balancer.

4
releasenotes/notes/Fix-allocate_and_associate-deadlock-3ff1464421c1d464.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixes a potential DB deadlock in allocate_and_associate found in testing.