Skip to content

remove read-write conflicts#18003

Open
Oreoxmt wants to merge 1 commit into
pingcap:masterfrom
Oreoxmt:fix/troubleshoot-lock-conflicts
Open

remove read-write conflicts#18003
Oreoxmt wants to merge 1 commit into
pingcap:masterfrom
Oreoxmt:fix/troubleshoot-lock-conflicts

Conversation

@Oreoxmt
Copy link
Copy Markdown
Collaborator

@Oreoxmt Oreoxmt commented Jul 17, 2024

What is changed, added or deleted? (Required)

remove read-write conflicts from troubleshoot-lock-conflicts.md. ref: tikv/client-go#380

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)
  • v8.3 (TiDB 8.3 versions)
  • v8.2 (TiDB 8.2 versions)
  • v8.1 (TiDB 8.1 versions)
  • v8.0 (TiDB 8.0 versions)
  • v7.5 (TiDB 7.5 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 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

@Oreoxmt Oreoxmt added translation/doing This PR’s assignee is translating this PR. ONCALL Relates to documentation oncall. needs-cherry-pick-release-5.4 needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. labels Jul 17, 2024
@Oreoxmt Oreoxmt self-assigned this Jul 17, 2024
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Jul 17, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from oreoxmt, ensuring that each of them provides their approval before proceeding. For more information see the Code Review Process.

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

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 17, 2024
@Oreoxmt
Copy link
Copy Markdown
Collaborator Author

Oreoxmt commented Jul 17, 2024

/cc @you06

@ti-chi-bot ti-chi-bot Bot requested a review from you06 July 17, 2024 10:04
@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Jul 19, 2024

Removed the needs-cherry-pick-release-7.6 label because the v7.6 docs have been archived at https://docs-archive.pingcap.com/zh/tidb/v7.6 and will no longer receive new updates.

@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Aug 30, 2024

Removed the needs-cherry-pick-release-8.0 label because the v8.0 docs have been archived at https://docs-archive.pingcap.com/zh/tidb/v8.0 and will no longer receive new updates.

@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Dec 30, 2024

Removed the needs-cherry-pick-release-8.2 label because the v8.2 docs have been archived at https://docs-archive.pingcap.com/zh/tidb/v8.2 and will no longer receive new updates.

@qiancai
Copy link
Copy Markdown
Collaborator

qiancai commented Apr 25, 2026

Removed the needs-cherry-pick-release-5.4 label because the v5.4 docs have been archived at https://docs-archive.pingcap.com/zh/tidb/v5.4 and will no longer receive new updates.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-8.1 Should cherry pick this PR to release-8.1 branch. ONCALL Relates to documentation oncall. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. translation/doing This PR’s assignee is translating this PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants