Skip to content

sync base backoff time for troubleshoot-lock-conflicts.md (#9332)#9940

Merged
ti-chi-bot merged 1 commit intopingcap:release-6.1from
ti-chi-bot:cherry-pick-9332-to-release-6.1
Jun 21, 2022
Merged

sync base backoff time for troubleshoot-lock-conflicts.md (#9332)#9940
ti-chi-bot merged 1 commit intopingcap:release-6.1from
ti-chi-bot:cherry-pick-9332-to-release-6.1

Conversation

@ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #9332

Signed-off-by: youjiali1995 zlwgx1023@gmail.com

What is changed, added or deleted? (Required)

Default base backoff time has changed in tikv/client-go#388.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions (in Chinese).

  • master (the latest development version)
  • v6.1 (TiDB 6.1 versions)
  • v6.0 (TiDB 6.0 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch
Signed-off-by: youjiali1995 <zlwgx1023@gmail.com>
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Jun 21, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • TomShawn

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added area/deploy-upgrade-maintain Indicates that the Issue or PR belongs to the area of deployment, upgrade, and maintenance. area/transaction Indicates that the Issue or PR belongs to the area of transaction. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bugfix This PR fixes a bug. labels Jun 21, 2022
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR. label Jun 21, 2022
@ti-chi-bot ti-chi-bot requested a review from TomShawn June 21, 2022 09:52
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 21, 2022
@TomShawn
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

DetailsCommit hash: ce02dca

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 21, 2022
@ti-chi-bot ti-chi-bot merged commit 1959d1b into pingcap:release-6.1 Jun 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/deploy-upgrade-maintain Indicates that the Issue or PR belongs to the area of deployment, upgrade, and maintenance. area/transaction Indicates that the Issue or PR belongs to the area of transaction. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-6.1 This PR is cherry-picked to release-6.1 from a source PR.

3 participants