From c06a0e469bc611b0be72d10d6335b93b97c5afbb Mon Sep 17 00:00:00 2001
From: Zane Bitter <zbitter@redhat.com>
Date: Tue, 1 May 2018 12:11:33 -0400
Subject: [PATCH] Retry on deadlock in purge_deleted

Change-Id: I6dc7429b2564ab07dd66bf0cf0c8657ac1928508
Closes-Bug: #1721695
---
 heat/db/sqlalchemy/api.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index 805873e3e0..4294f9c80c 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -1318,6 +1318,8 @@ def purge_deleted(age, granularity='days', project_id=None, batch_size=20):
             break
 
 
+@oslo_db_api.wrap_db_retry(max_retries=3, retry_on_deadlock=True,
+                           retry_interval=0.5, inc_retry_interval=True)
 def _purge_stacks(stack_infos, engine, meta):
     """Purge some stacks and their releated events, raw_templates, etc.