fix(worker): prevent poisoned SQLAlchemy sessions from reuse - #1876
Open
sentry[bot] wants to merge 1 commit into
Open
fix(worker): prevent poisoned SQLAlchemy sessions from reuse#1876sentry[bot] wants to merge 1 commit into
sentry[bot] wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR addresses an issue where SQLAlchemy sessions could be left in a 'prepared' state and subsequently reused by other tasks, leading to
InvalidRequestError: This session is in 'prepared' state; no further SQL can be emitted within this transaction.The root cause was identified in
apps/worker/tasks/base.pywithin thewrap_up_dbsessionmethod. When aSoftTimeLimitExceededexception occurred duringdb_session.commit(), the session would enter a 'prepared' state. If the subsequent retry commit also failed with an exception other thanInvalidRequestError, theget_db_session.remove()call was bypassed, leaving the poisoned session in the scoped registry.To fix this, two changes were made:
get_db_session.remove()is now called immediately after catching the initialSoftTimeLimitExceeded. This ensures the poisoned session is evicted from the registry regardless of what happens during the retry attempt.except InvalidRequestErrorblock, which handles failures during the retry commit, has been widened toexcept Exception. This guarantees thatget_db_session.remove()is called for any exception that might occur during the retry commit, preventing any further session leakage.Legal Boilerplate
Look, I get it. The entity doing business as "Codecov" is owned by Harness, Inc. In 2026 Harness acquired Codecov and as a result Harness is going to need some rights from me in order to utilize my contributions in this PR. So here's the deal: I retain all rights, title and interest in and to my contributions, and by keeping this boilerplate intact I confirm that Harness can use, modify, copy, and redistribute my contributions, under Harness's choice of terms.
Fixes WORKER-YND