Skip to content

[Messenger] Swallow Exception on Rollback #54355

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

Open
wants to merge 1 commit into
base: 7.4
Choose a base branch
from
Open

[Messenger] Swallow Exception on Rollback #54355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 1 deletion src/Symfony/Bridge/Doctrine/Messenger/DoctrineTransactionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ protected function handleForManager(EntityManagerInterface $entityManager, Envel

return $envelope;
} catch (\Throwable $exception) {
$entityManager->getConnection()->rollBack();
try {
$entityManager->getConnection()->rollBack();
} catch (\Throwable $e) {
Copy link
Contributor Author

@rodnaph rodnaph Mar 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
} catch (\Throwable $e) {
} catch (\Throwable $e) {
$exception = new \Exception($e->getMessage(), $e->getCode(), $exception);

Is it better to pass along some notification of rollback failure? This will interfere with the check a few lines below though, so would need to be structured differently.

}

if ($exception instanceof HandlerFailedException) {
// Remove all HandledStamp from the envelope so the retry will execute all handlers again.
Expand Down
16 changes: 16 additions & 0 deletions src/Symfony/Bridge/Doctrine/Tests/Messenger/DoctrineTransactionMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,22 @@ public function testTransactionIsRolledBackOnException()
$this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
}

public function testExceptionRollingBackTransactionSwallowed()
{
$this->connection->expects($this->once())
->method('beginTransaction')
;
$this->connection->expects($this->once())
->method('rollBack')
->will($this->throwException(new \Exception('Could not roll back transaction.')))
;

$this->expectException(\RuntimeException::class);
$this->expectExceptionMessage('Thrown from next middleware.');

$this->middleware->handle(new Envelope(new \stdClass()), $this->getThrowingStackMock());
}

public function testInvalidEntityManagerThrowsException()
{
$managerRegistry = $this->createMock(ManagerRegistry::class);
Expand Down