Skip to content
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

chore(deps,test): integrate engine iTX error messages changes #16382

Merged
merged 2 commits into from Nov 23, 2022

Conversation

aqrln
Copy link
Member

@aqrln aqrln commented Nov 21, 2022

@aqrln aqrln requested review from a team and SevInf and removed request for a team November 21, 2022 16:53
@aqrln

This comment was marked as outdated.

Copy link
Contributor

@SevInf SevInf left a comment

Choose a reason for hiding this comment

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

LGTM after engine changes are done

aqrln added a commit to prisma/prisma-engines 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
@Jolg42 Jolg42 added this to the 4.7.0 milestone Nov 23, 2022
@aqrln aqrln changed the title test(client): integrate engine iTX error messages changes chore: integrate engine iTX error messages changes Nov 23, 2022
@aqrln aqrln changed the title chore: integrate engine iTX error messages changes chore(deps,test): integrate engine iTX error messages changes Nov 23, 2022
@aqrln aqrln merged commit cdc36e1 into main Nov 23, 2022
@aqrln aqrln deleted the integrate-itx-errors branch November 23, 2022 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants