Skip to content

reference: update documents about pessimistic transaction#1854

Merged
sre-bot merged 15 commits into
pingcap:masterfrom
ran-huang:update-pessimistic-txn
Apr 8, 2020
Merged

reference: update documents about pessimistic transaction#1854
sre-bot merged 15 commits into
pingcap:masterfrom
ran-huang:update-pessimistic-txn

Conversation

@ran-huang
Copy link
Copy Markdown
Contributor

@ran-huang ran-huang commented Feb 24, 2020 •
edited
Loading

What is changed, added or deleted?

Update documents about pessimistic transactions.

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

Important Notice:

If your changes apply to multiple TiDB documentation versions, to trigger the bot to cherry-pick this PR to other release branches, make sure you add labels such as:

  • needs-cherry-pick-3.0
  • needs-cherry-pick-3.1
  • needs-cherry-pick-2.1

@ran-huang ran-huang added v3.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v4.0 This PR/issue applies to TiDB v4.0. size/large Changes of a large size. labels Feb 24, 2020
@ran-huang ran-huang added the DNM label Feb 25, 2020
@yikeke yikeke removed dev labels Mar 3, 2020
@yikeke yikeke removed the v3.1 label Mar 3, 2020
@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Mar 4, 2020

Resolved conflict with #1875.

@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Mar 6, 2020

This PR does not pass CI check, because it has a link pointing to a new document in pingcap/docs-cn#2198 that is still in translation.
So this PR will proceed after the translation is completed.

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 18, 2020

This PR does not pass CI check, because it has a link pointing to a new document in pingcap/docs-cn#2198 that is still in translation.
So this PR will proceed after the translation is completed.

#2198 is now merged. You can proceed with this PR now.

@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Mar 18, 2020

This PR does not pass CI check, because it has a link pointing to a new document in pingcap/docs-cn#2198 that is still in translation.
So this PR will proceed after the translation is completed.

#2198 is now merged. You can proceed with this PR now.

#2198 is merged but its aligned PR in docs #1695 is still in progress. I have to wait until the optimistic-transaction.md file in #1695 is merged.

@TomShawn
Copy link
Copy Markdown
Contributor

TomShawn commented Mar 18, 2020

#2198 is merged but its aligned PR in docs #1695 is still in progress. I have to wait until the optimistic-transaction.md file in #1695 is merged.

OK

@lilin90
Copy link
Copy Markdown
Member

lilin90 commented Mar 24, 2020 •
edited
Loading

@ran-huang I see that @anotherrachel closed #1695. PTAL~

@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Mar 24, 2020

@ran-huang I see that @anotherrachel closed #1695. PTAL~

Thanks.

@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Apr 3, 2020

CI fails due to a dealink. Waiting for #2088

@ran-huang
Copy link
Copy Markdown
Contributor Author

ran-huang commented Apr 3, 2020

@lilin90 @youjiali1995 PTAL~

youjiali1995
youjiali1995 approved these changes Apr 3, 2020
View reviewed changes
Copy link
Copy Markdown

@youjiali1995 youjiali1995 left a comment

Choose a reason for hiding this comment

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

lgtm

lilin90
lilin90 reviewed Apr 8, 2020
View reviewed changes
Copy link
Copy Markdown
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.

Rest LGTM

Comment thread reference/transactions/transaction-pessimistic.md Outdated
Comment thread reference/transactions/transaction-pessimistic.md Outdated
@ran-huang ran-huang added the status/can-merge Indicates a PR has been approved by a committer. label Apr 8, 2020
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 8, 2020

/run-all-tests

@sre-bot sre-bot merged commit 9650128 into pingcap:master Apr 8, 2020
sre-bot pushed a commit to sre-bot/docs that referenced this pull request Apr 8, 2020
@ran-huang @sre-bot
cherry pick pingcap#1854 to release-3.0
0f57616 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Apr 8, 2020
Merged
1 task
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-3.0 in PR #2205

sre-bot pushed a commit to sre-bot/docs that referenced this pull request Apr 8, 2020
@ran-huang @sre-bot
cherry pick pingcap#1854 to release-3.1
8acdf59 
Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot sre-bot mentioned this pull request Apr 8, 2020
Merged
1 task
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-3.1 in PR #2206

sre-bot pushed a commit to sre-bot/docs that referenced this pull request Apr 8, 2020
@ran-huang @sre-bot
reference: update documents about pessimistic transaction (pingcap#1854)
4aa047d
@sre-bot sre-bot mentioned this pull request Apr 8, 2020
Merged
1 task
@sre-bot
Copy link
Copy Markdown
Contributor

sre-bot commented Apr 8, 2020

cherry pick to release-4.0 in PR #2207

sre-bot added a commit that referenced this pull request Apr 8, 2020
@sre-bot
reference: update documents about pessimistic transaction (#1854) (#2207
a478340 
)
ran-huang added a commit that referenced this pull request Apr 19, 2020
@sre-bot @ran-huang @lilin90
reference: update documents about pessimistic transaction (#1854) (#2206
5bb28dd 
)

* cherry pick #1854 to release-3.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

* resolve conflict

Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: Lilian Lee <lilin@pingcap.com>
sre-bot added a commit that referenced this pull request Apr 23, 2020
@sre-bot
reference: update documents about pessimistic transaction (#1854) (#2205
65deff9 
)

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@ran-huang ran-huang deleted the update-pessimistic-txn branch June 2, 2020 02:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lilin90 lilin90 lilin90 left review comments

+1 more reviewer

@youjiali1995 youjiali1995 youjiali1995 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

size/large Changes of a large size. status/can-merge Indicates a PR has been approved by a committer. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. v4.0 This PR/issue applies to TiDB v4.0.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@ran-huang @TomShawn @lilin90 @sre-bot @youjiali1995 @yikeke