Merge "Retry _trait_sync on deadlock"

2017-12-14 21:47:57 +00:00
parent 70deaeb93e c66ae65775
commit 32d956485a
1 changed files with 1 additions and 0 deletions
--- a/nova/objects/resource_provider.py
+++ b/nova/objects/resource_provider.py
@@ -73,6 +73,7 @@ def _ensure_rc_cache(ctx):
    _RC_CACHE = rc_cache.ResourceClassCache(ctx)


+@oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
@db_api.api_context_manager.writer
 def _trait_sync(ctx):
    """Sync the os_traits symbols to the database.