1 files changed, 6 insertions, 2 deletions
diff --git a/mod/database-module.cxx b/mod/database-module.cxx
index bbb3e59..bce8c93 100644
--- a/mod/database-module.cxx
+++ b/mod/database-module.cxx
@@ -119,10 +119,14 @@ namespace brep
       }
       catch (const odb::recoverable& e)
       {
+        HANDLER_DIAG;
+
+        // If no more retries left, don't re-throw odb::recoverable not to
+        // retry at the upper level.
+        //
         if (retry-- == 0)
-          throw;
+          fail << e << "; no tenant service state update retries left";
 
-        HANDLER_DIAG;
         l1 ([&]{trace << e << "; " << retry + 1 << " tenant service "
                       << "state update retries left";});