-
Notifications
You must be signed in to change notification settings - Fork 55
fix(transaction): tolerate desynced cleanup rollback on startTransaction #895
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.
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
Merged
+105
−10
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
41536db
fix(transaction): tolerate desynced cleanup rollback on startTransaction
loks0n d9ed545
test: cover transaction begin failure
abnegate 0913c18
fix(transaction): tolerate postgres cleanup rollback
abnegate 240b957
Merge branch 'main' into fix/start-transaction-desynced-rollback
abnegate File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
|
|
||
| namespace Tests\Unit; | ||
|
|
||
| use PDOException; | ||
| use PHPUnit\Framework\TestCase; | ||
| use Utopia\Database\Adapter\MySQL; | ||
| use Utopia\Database\Adapter\Postgres; | ||
| use Utopia\Database\Exception\Transaction as TransactionException; | ||
|
|
||
| class SQLTransactionTest extends TestCase | ||
| { | ||
| /** | ||
| * A pooled connection (e.g. Swoole PDOProxy) can keep its own transaction | ||
| * counter that survives a reconnect, so it reports an open transaction the | ||
| * underlying connection no longer holds. The cleanup rollBack() then throws | ||
| * "There is no active transaction". startTransaction() must swallow that and | ||
| * still begin a fresh transaction instead of surfacing it as a failure. | ||
| */ | ||
| public function testStartTransactionRecoversFromDesyncedRollback(): void | ||
| { | ||
| $pdo = $this->getMockBuilder(\PDO::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $pdo->method('inTransaction')->willReturn(true); | ||
| $pdo->method('rollBack')->willThrowException( | ||
| new PDOException('There is no active transaction') | ||
| ); | ||
| $pdo->expects($this->once()) | ||
| ->method('beginTransaction') | ||
| ->willReturn(true); | ||
|
|
||
| $adapter = new MySQL($pdo); | ||
|
|
||
| $this->assertTrue($adapter->startTransaction()); | ||
| $this->assertTrue($adapter->inTransaction()); | ||
| } | ||
|
|
||
| public function testStartTransactionDoesNotMaskBeginFailureAfterDesyncedRollback(): void | ||
| { | ||
| $pdo = $this->getMockBuilder(\PDO::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $pdo->method('inTransaction')->willReturn(true); | ||
| $pdo->method('rollBack')->willThrowException( | ||
| new PDOException('There is no active transaction') | ||
| ); | ||
| $pdo->expects($this->once()) | ||
| ->method('beginTransaction') | ||
| ->willThrowException(new PDOException('Connection lost')); | ||
|
|
||
| $adapter = new MySQL($pdo); | ||
|
|
||
| $this->expectException(TransactionException::class); | ||
| $this->expectExceptionMessage('Failed to start transaction: Connection lost'); | ||
|
|
||
| $adapter->startTransaction(); | ||
| } | ||
|
|
||
| public function testPostgresStartTransactionRecoversFromDesyncedRollback(): void | ||
| { | ||
| $pdo = $this->getMockBuilder(\PDO::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
|
|
||
| $pdo->method('inTransaction')->willReturn(true); | ||
| $pdo->method('rollBack')->willThrowException( | ||
| new PDOException('There is no active transaction') | ||
| ); | ||
| $pdo->expects($this->once()) | ||
| ->method('beginTransaction') | ||
| ->willReturn(true); | ||
|
|
||
| $adapter = new Postgres($pdo); | ||
|
|
||
| $this->assertTrue($adapter->startTransaction()); | ||
| $this->assertTrue($adapter->inTransaction()); | ||
| } | ||
| } |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.