openstack
/
senlin
Code Issues Proposed changes

Add retry_on_deadlock to policy operations 

I believe that policy detach needs a retry on deadlock added to it
as it is an operation that requires the cluster to be locked.

Input on this would be helpful.

Change-Id: I5b6662e0e08f01ed720778bf3d8313a1ffe68aa9
This commit is contained in:
Jude Cross 2018-05-16 16:47:40 -07:00
parent 9865d71b33
commit fca63bdca1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
senlin/db/sqlalchemy/api.py
View File

@ -697,6 +697,7 @@ def cluster_policy_get_by_name(context, cluster_id, policy_name, filters=None):
return query.all()
@retry_on_deadlock
def cluster_policy_attach(context, cluster_id, policy_id, values):
with session_for_write() as session:
binding = models.ClusterPolicies()
@ -708,6 +709,7 @@ def cluster_policy_attach(context, cluster_id, policy_id, values):
return cluster_policy_get(context, cluster_id, policy_id)
@retry_on_deadlock
def cluster_policy_detach(context, cluster_id, policy_id):
with session_for_write() as session:
query = session.query(models.ClusterPolicies)
@ -718,6 +720,7 @@ def cluster_policy_detach(context, cluster_id, policy_id):
session.delete(bindings)
@retry_on_deadlock
def cluster_policy_update(context, cluster_id, policy_id, values):
with session_for_write() as session:
query = session.query(models.ClusterPolicies)