Merge "Avoid excessing logging of RetryRequest exception" into stable/kilo1.7.2

1 files changed, 5 insertions, 1 deletions

diff --git a/oslo_db/api.py b/oslo_db/api.py
index 616cac5..0ba07e8 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.