fix(spanner): ensure active transaction is rolled back on exception - #9416
Open
cy-yun wants to merge 1 commit into
Open
fix(spanner): ensure active transaction is rolled back on exception#9416cy-yun wants to merge 1 commit into
cy-yun 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 in Cloud Spanner where an active transaction might leak if an exception is thrown during the
Database::runTransactioncallback.Previously, if a user-provided callback threw an exception, the exception would bubble up without explicitly rolling back the transaction. This PR catches any
\Throwablethrown by the callback, checks if the transaction is still active, and explicitly issues a rollback to the Spanner backend before re-throwing the exception.Additional Fixes
While adding this, a latent bug was discovered and fixed:
Database::runTransactionwas passing its configuration$optionsdirectly into$transaction->rollback($options). SincerunTransactionoptions (liketag,isRetry,singleUse) are not validCallOptionsforOperation::rollback, this would cause anInvalidArgumentException(e.g.,Unexpected option(s) provided: tag). This exception was masking the rollback failure and leaving the transaction un-rolled back on the server.This PR fixes this by calling
$transaction->rollback()without passing therunTransactionconfiguration options, ensuring the rollback completes successfully.Testing
testRunTransactionRollsBackOnException: Verifies that an exception in the callback triggers a rollback.testRunTransactionNoCommitWithTag: Verifies that passingtagtorunTransactionno longer causes anInvalidArgumentExceptionwhen the transaction must be rolled back at the end of execution.