Skip to content

add troubleshooting-write-conflict #3064

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 32 commits into from
Jul 9, 2020
Merged

add troubleshooting-write-conflict #3064

merged 32 commits into from
Jul 9, 2020

Conversation

@crazycs520
Copy link
Contributor

@crazycs520 crazycs520 commented Jun 29, 2020 •
edited by yikeke
Loading

What is changed, added or deleted? (Required)

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

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

@crazycs520
init
d9a23c6 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@crazycs520
update
d9c54aa 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@crazycs520
refine
a109c61 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@crazycs520
Merge branch 'master' of https://github.com/pingcap/docs into translate
68125c3
@crazycs520
add png
0f41e53 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@crazycs520
refine
ab9f9af 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@yikeke yikeke changed the title Translate add troubleshooting-write-conflict Jun 30, 2020
@yikeke yikeke requested review from Win-Man and lilin90 June 30, 2020 04:49
@yikeke yikeke added needs-cherry-pick-4.0 status/PTAL This PR is ready for reviewing. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Jun 30, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 2, 2020

@Win-Man, @lilin90, PTAL.

Win-Man
Win-Man reviewed Jul 3, 2020
View reviewed changes
Win-Man
Win-Man reviewed Jul 3, 2020
View reviewed changes
Win-Man
Win-Man reviewed Jul 4, 2020
View reviewed changes
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 6, 2020

@Win-Man, @lilin90, PTAL.

@lilin90 lilin90 added the status/require-change Needs the author to address comments. label Jul 7, 2020
@crazycs520
address comment
29742fc 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
lilin90
lilin90 reviewed Jul 7, 2020
View reviewed changes
@lilin90 lilin90 added size/large Changes of a large size. requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. labels Jul 7, 2020
crazycs520 and others added 6 commits July 8, 2020 10:54
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
13a3820 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
48bc37a 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
9d6c8e4 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
1138e05 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
e6668cb 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
f055478 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
crazycs520 and others added 8 commits July 8, 2020 10:59
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
94472e1 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
6465de1 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
b1c0d4d 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
367774f 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520 @lilin90
Update troubleshoot-write-conflicts.md
55fdf7b 
Co-authored-by: Lilian Lee <lilin@pingcap.com>
@crazycs520
add toc
ca62fac 
Signed-off-by: crazycs520 <crazycs520@gmail.com>
@crazycs520
Merge branch 'translate' of https://github.com/crazycs520/docs into t…
0cb9812 
…ranslate
@crazycs520
Merge branch 'master' into translate
596fd76
lilin90
lilin90 reviewed Jul 8, 2020
View reviewed changes
@lilin90
Copy link
Member

lilin90 commented Jul 8, 2020

@Win-Man PTAL again~ Thanks!

Win-Man
Win-Man reviewed Jul 8, 2020
View reviewed changes
Copy link
Contributor

@Win-Man Win-Man left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 8, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 8, 2020

@Win-Man,Thanks for your review.

lilin90
lilin90 approved these changes Jul 9, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 9, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 9, 2020

@lilin90,Thanks for your review.

@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 9, 2020
@lilin90
Copy link
Member

lilin90 commented Jul 9, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 9, 2020
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 9, 2020

/run-all-tests

@lilin90 lilin90 merged commit 9d749f1 into pingcap:master Jul 9, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jul 9, 2020
@crazycs520 @ti-srebot
cherry pick pingcap#3064 to release-4.0
96d08e3 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jul 9, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

ti-srebot commented Jul 9, 2020

cherry pick to release-4.0 in PR #3211

lilin90 added a commit that referenced this pull request Jul 9, 2020
@ti-srebot @crazycs520 @lilin90
add troubleshooting-write-conflict (#3064) (#3211)
e0bf3e0 
* cherry pick #3064 to release-4.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update troubleshoot-write-conflicts.md

Co-authored-by: crazycs <crazycs520@gmail.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lilin90 lilin90 lilin90 approved these changes

@ti-srebot ti-srebot ti-srebot approved these changes

+1 more reviewer

@Win-Man Win-Man Win-Man left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. size/large Changes of a large size. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. status/PTAL This PR is ready for reviewing. status/require-change Needs the author to address comments. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@crazycs520 @ti-srebot @lilin90 @Win-Man @yikeke