[5.1] Never retry query if failed within transaction #12929
Merged
+33
−0
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.
Here's the scenario:
This causes the following to happen
Connection::tryAgainIfCausedByLostConnection()
is called insideConnection::run()
Connection::reconnect()
is called insidetryAgainIfCausedByLostConnection()
DatabaseManager::reconnect()
is calledDatabaseManager::disconnect()
is called insideDatabaseManager::reconnect()
Connection::disconnect()
is called insideDatabaseManager::disconnect()
Connection::setPdo(null)
is called insideConnection::disconnect()
Inside
setPDO()
:So while there's a transaction open a retry can never happen, the result of this behaviour is that a
RuntimeException
is thrown hiding theQueryException
which contains useful information about the problem.This PR checks if there's a transaction open when a
QueryException
is thrown, if so it just throws the exception again for developers to handle it properly and never retries the query because it'll fail anyway.