Retry on database deadlock on service_update method

service_update could fail with deadlock in some active-active
deployments. Added _retry_on_deadlock decorator to fix this issue.

Change-Id: Icfedb5ec0042e1d588314d56856f9ebab537665e
Closes-Bug: #1516124

diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index b3869e0aef2dae8a4b0fad1ab4707bbb4ad1d601..f3e26eb7f98f5b21690d7fe7457ea200713d639b 100644 (file)
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -436,6 +436,7 @@ def service_create(context, values):
 
 
 @require_admin_context
+@_retry_on_deadlock
 def service_update(context, service_id, values):
     session = get_session()
     with session.begin():