Avoid nested db transaction when action udpate

2015-02-04 16:15:03 +08:00
parent e29f020a11
commit 0488c32226
1 changed files with 1 additions and 1 deletions
--- a/senlin/db/sqlalchemy/api.py
+++ b/senlin/db/sqlalchemy/api.py
@@ -1012,11 +1012,11 @@ def _mark_failed_action(query, action_id, timestamp, reason):

 def action_mark_failed(context, action_id, timestamp, reason=None):
    query = model_query(context, models.Action)
-    action = query.get(action_id)

    session = query.session
    session.begin()

+    action = query.get(action_id)
    action.owner = None
    action.status = ACTION_FAILED
    if reason is not None: