From 33e5f9bdb7d5af7acaa8c9a51c14816c3bf1f5d7 Mon Sep 17 00:00:00 2001 From: Victor Romano Date: Fri, 14 Mar 2025 09:56:25 -0300 Subject: [PATCH] Improve exception handling on db_session_cleanup decorator The previous commit [1] introduced a decorator to cleanup db sessions at the end of the call. If an exception happen before calling the db_api, sys.exc_info() will still carry the exception information, which can lead to problems depending on the use case. This commit makes sure that we only use the exception value of the db function execution. Test plan: - PASS: Build a custom ISO with the changes and deploy a DX system controller and a SX subcloud. Verify the system works as expected. - PASS: Manage a subcloud and verify the sync_status is "in-sync". - PASS: Soak the system and verify there was no connection leak and no sessions stuck in "idle in transaction" state. [1]: https://review.opendev.org/c/starlingx/fault/+/943387 Story: 2011311 Task: 51790 Change-Id: Ib5c5f052aadebc19e671564739d3d2d74a1de5fb Signed-off-by: Victor Romano --- fm-rest-api/fm/fm/db/sqlalchemy/api.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/fm-rest-api/fm/fm/db/sqlalchemy/api.py b/fm-rest-api/fm/fm/db/sqlalchemy/api.py index d17b3170..fd50593c 100755 --- a/fm-rest-api/fm/fm/db/sqlalchemy/api.py +++ b/fm-rest-api/fm/fm/db/sqlalchemy/api.py @@ -106,16 +106,20 @@ def db_session_cleanup(cls): @functools.wraps(method) def wrapper(self, *args, **kwargs): _context = eventlet.greenthread.getcurrent() + exc_info = (None, None, None) try: return method(self, *args, **kwargs) + except Exception: + exc_info = sys.exc_info() + raise finally: - if (hasattr(_context, "_db_session_context") and - _context._db_session_context is not None): + if ( + hasattr(_context, "_db_session_context") and + _context._db_session_context is not None + ): try: - if hasattr(_context, "_db_session_context"): - exc_info = sys.exc_info() - _context._db_session_context.__exit__(*exc_info) + _context._db_session_context.__exit__(*exc_info) except Exception as e: LOG.warning(f"Error closing database session: {e}")