Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[23.2] Anticipate PendingRollbackError in check_database_connection #17598

Merged
merged 3 commits into from
Mar 6, 2024
Merged

[23.2] Anticipate PendingRollbackError in check_database_connection #17598

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffa58ae
Anticipate PendingRollbackError in ``check_database_connection``
mvdbeek Mar 5, 2024
fb89a26
Explicitly check for transaction state
jdavcs Mar 5, 2024
149e281
session may be a scoped_session and may not have a transaction
jdavcs Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/galaxy/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@ def check_database_connection(session):
by rolling back the invalidated transaction.
Ref: https://docs.sqlalchemy.org/en/14/errors.html#can-t-reconnect-until-invalid-transaction-is-rolled-back
"""
if session and session.connection().invalidated:
log.error("Database transaction rolled back due to invalid state.")
assert session
if not session.get_transaction().is_active or session.connection().invalidated:
session.rollback()
log.error("Database transaction rolled back due to inactive session transaction or invalid connection state.")


# TODO: Refactor this to be a proper class, not a bunch.
Expand Down
Loading