txn: fix the error message if retry could not be used for rc check ts #35474
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
|
[REVIEW NOTIFICATION] This pull request has been approved by:
To complete the pull request process, please ask the reviewers in the list to review by filling The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
ti-chi-bot
added
release-note-none
ekexium
approved these changes
Jun 17, 2022
|
Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/b0df766722ce9f93517a550c50f4fce45f855299 |
xhebox
approved these changes
Jun 29, 2022
ti-chi-bot
added
status/LGT2
ti-chi-bot
removed
the
needs-rebase
|
/merge |
|
This pull request has been accepted and is ready to merge. Commit hash: 0d3b172
|
ti-chi-bot
added
the
status/can-merge
TiDB MergeCI notify🔴 Bad News! [1] CI still failing after this pr merged.
|
morgo
added a commit
to morgo/tidb
that referenced
this pull request
Jun 29, 2022
…vars * upstream/master: (28 commits) *: enable unconvert (pingcap#35821) log-backup: check timezone when using datatime format ts string (pingcap#35811) planner: support the leading hint for outer join (pingcap#35264) lightning: revert new policy of allocating rowid and refine it later (pingcap#35817) txn: manage the initialization of RCCheckTS by transaction context provider (pingcap#35554) ddl: make output field name in `show tables/databases stmt` compatible with mysql (pingcap#35136) txn: remove `legacy.SimpleTxnContextProvider` (pingcap#35667) txn: fix the error message if retry could not be used for rc check ts (pingcap#35474) *: support canceling DDL statements with KILL (pingcap#35803) lightning: avoid extracting db schema when schema file is not provided (pingcap#35783) *: enable all gosimples (pingcap#35762) tools/check: skip 'tests' directory in 'make ut' (pingcap#35800) metrics: add loading region cache duration (pingcap#34679) ddl: DROP TABLE/VIEW/SEQUENCE now use XXXStmt as parameter (pingcap#35741) types: fix incompatible implementation of jsonpath extraction (pingcap#35320) planner: fix TRACE PLAN TARGET = 'estimation' panic when meeting partition table (pingcap#35743) *: Add `testfork.RunTest` to run multiple tests in one function (pingcap#35746) sessionctx/variable: add tests to ensure skipInit can be removed (pingcap#35703) helper: request another PD if one of them is unavailable (pingcap#35750) metrics: add cached table related metrics to grafana panel (pingcap#34718) ...
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.
What problem does this PR solve?
Issue Number: close #35473
Problem Summary:
The returned error message is
Write conflict, txnStartTS=%d, conflictStartTS=%d, conflictCommitTS=%d, key=%s [try again later]if retry could not be done. This confuses users and contains invalid formats.What is changed and how it works?
Return a valid error message content
write conflict, start_ts:433968042180870146, conflict_start_ts:0, conflict_commit_ts:433968042416537602, key:7480000000000000FF455F728000000000FF0000010000000000FAF9FA3C5D5BE3FFFDCheck List
Tests
Check the error message is retry has failed.
Side effects
Documentation
Release note
Please refer to Release Notes Language Style Guide to write a quality release note.