fix: opening & closing many itx should not increase time #3028
Conversation
This file contains 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
garrensmith
suggested changes
Jul 1, 2022
query-engine/core/src/interactive_transactions/actor_manager.rs
Outdated
Show resolved
Hide resolved
query-engine/core/src/interactive_transactions/actor_manager.rs
Outdated
Show resolved
Hide resolved
| mut rx: Receiver<TxId>, | ||
| ) -> JoinHandle<()> { | ||
| tokio::task::spawn(async move { | ||
| loop { | ||
| if let Some(id) = rx.recv().await { | ||
| trace!("removing {} from client list", id); | ||
| clients.write().await.remove(&id); | ||
|
|
||
| let mut guard = clients.write().await; |
There was a problem hiding this comment.
Another minor nit. This is a guard and the actual Hashmap. So a better name is client_map or map.
There was a problem hiding this comment.
Renamed it to clients_guard, since we're dropping the guard, not the map, right?
There was a problem hiding this comment.
Yeah that is good. Its a guard that wraps the map.
garrensmith
approved these changes
Jul 1, 2022
Weakky
changed the title
yume-chan
pushed a commit
to yume-chan/prisma-engines
that referenced
this pull request
Jul 8, 2022
aqrln
added a commit
that referenced
this pull request
Nov 23, 2022
Make the error messages for closed transactions more detailed, add extra context about the transaction timeout. Before: - `Transaction API error: Transaction already closed: A query/commit/rollback cannot be executed on a closed transaction..` (also note the double "." at the end) Now: - `Transaction API error: Transaction already closed: A query/commit/rollback cannot be executed on a committed transaction.` - `Transaction API error: Transaction already closed: A query/commit/rollback cannot be executed on a transaction that was rolled back.` - `Transaction API error: Transaction already closed: A query/commit/rollback cannot be executed on an expired transaction. The timeout for this transaction was X ms, however Y ms passed since the start of the transaction. Consider increasing the interactive transaction timeout or doing less work in the transaction.` Additionally, the "Transaction not found error" is now also more verbose, ref: https://www.notion.so/disconnect-with-iTX-f3cfee3ff4924e40aa90aadb2454e9fa?d=3bd7c7103b02461bbfe414a978a994c1#547ab127682b41898c87bdd5c841c0bf Also contains minor cleanup things related to iTX: * Remove the unused `CachedTx::Aborted` variant * Remove references to an obsolete env var that doesn't exist since #3028 from comments and `.envrc` Client PR: prisma/prisma#16382 Closes: prisma/prisma#13713 Ref: prisma/prisma#16050 Ref: #3028
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.
Overview
fixes prisma/prisma#12516
The clippy issues don't seem related to my changes