Merge "Fix allocate_and_associate DB deadlock"
This commit is contained in:
commit
acf551c0bd
|
@ -1137,6 +1137,7 @@ class AmphoraRepository(BaseRepository):
|
||||||
id=amphora_id).first()
|
id=amphora_id).first()
|
||||||
load_balancer.amphorae.append(amphora)
|
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):
|
def allocate_and_associate(self, session, load_balancer_id):
|
||||||
"""Allocate an amphora for a load balancer.
|
"""Allocate an amphora for a load balancer.
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes a potential DB deadlock in allocate_and_associate found in testing.
|
Loading…
Reference in New Issue