From 02aeda28cf8b69f39f934a3e80cb7cae04c5fc20 Mon Sep 17 00:00:00 2001
From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Tue, 17 Mar 2015 14:17:41 +0300
Subject: [PATCH] Avoid excessing logging of RetryRequest exception

Such exception indicates of error condition only if
retries are exceeded. In other cases error-level logs
pollute the log file and complicate log analysis.

Change-Id: I318867043a68a6499851631593859a0fffac6038
Closes-Bug: #1433001
---
 oslo_db/api.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/oslo_db/api.py b/oslo_db/api.py
index 616cac50..0ba07e8f 100644
--- a/oslo_db/api.py
+++ b/oslo_db/api.py
@@ -139,7 +139,11 @@ class wrap_db_retry(object):
                         raise e
                     if remaining != -1:
                         remaining -= 1
-                        LOG.exception(_LE('DB error.'))
+                        # RetryRequest is application-initated exception
+                        # and not an error condition in case retries are
+                        # not exceeded
+                        if not isinstance(e, exception.RetryRequest):
+                            LOG.exception(_LE('DB error.'))
                     # NOTE(vsergeyev): We are using patched time module, so
                     #                  this effectively yields the execution
                     #                  context to another green thread.