Skip to content
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

add binlog usage restrictions #5832

Merged
merged 6 commits into from
Mar 25, 2021
Merged

add binlog usage restrictions #5832

merged 6 commits into from
Mar 25, 2021

Conversation

IANTHEREAL
Copy link
Contributor

First-time contributors' checklist

What is changed, added or deleted? (Required)

Increase the restriction of using binlog in version 5.0

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

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • 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)?

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

@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 25, 2021
zier-one
zier-one reviewed Mar 25, 2021
View reviewed changes
@IANTHEREAL
Copy link
Contributor Author

@sticnarf PTAL

zier-one
zier-one reviewed Mar 25, 2021
View reviewed changes
Copy link
Contributor

@zier-one zier-one left a comment

Choose a reason for hiding this comment

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

/lgtm

sticnarf
sticnarf approved these changes Mar 25, 2021
View reviewed changes
Copy link
Contributor

@sticnarf sticnarf 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-chi-bot
Copy link
Member

@sticnarf: /lgtm is only allowed for the reviewers in list.

In response to this:

LGTM

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@yikeke yikeke added needs-cherry-pick-5.0 translation/doing This PR’s assignee is translating this PR. and removed missing-translation-status This PR does not have translation status info. labels Mar 25, 2021
@yikeke yikeke added the v5.0 This PR/issue applies to TiDB v5.0 label Mar 25, 2021
yikeke
yikeke reviewed Mar 25, 2021
View reviewed changes
tidb-binlog/tidb-binlog-overview.md
Comment on lines +58 to +60
* TiDB Binlog 与 TiDB v4.0.7 版本开始引入的以下特性不兼容，无法一起使用：

- TiDB 系统变量 [tidb_enable_amend_pessimistic_txn](/system-variables.md#tidb_enable_amend_pessimistic_txn-从-v407-版本开始引入)：两个功能存在兼容性问题，一起使用会造成 TiDB Binlog 复制数据不一致的正确性问题。
Copy link
Contributor

Choose a reason for hiding this comment

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

这个提醒得 cherry-pick 到 4.0 文档吧？

Copy link
Contributor Author

Choose a reason for hiding this comment

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

可以，这个合并后，我把这段挪过去

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • yikeke

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.

Reviewer can indicate their review by writing /lgtm in a comment.
Reviewer can cancel approval by writing /lgtm cancel in a comment.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 25, 2021
@yikeke
Copy link
Contributor

yikeke commented Mar 25, 2021

/merge

@ti-chi-bot
Copy link
Member

@yikeke: /merge in this pull request requires 2 /lgtm.

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@yikeke
Copy link
Contributor

yikeke commented Mar 25, 2021

/status LGT2

@ti-chi-bot ti-chi-bot added the status/LGT2 Indicates that a PR has LGTM 2. label Mar 25, 2021
@yikeke
Copy link
Contributor

yikeke commented Mar 25, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: cd3dddd

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 25, 2021
@ti-chi-bot ti-chi-bot merged commit 31bd8f6 into pingcap:master Mar 25, 2021
ti-srebot pushed a commit to ti-srebot/docs-cn that referenced this pull request Mar 25, 2021
@IANTHEREAL @ti-srebot
cherry pick pingcap#5832 to release-5.0
79b38d1 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Mar 25, 2021
Merged
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #5840

@yikeke yikeke added the requires-followup This PR requires a follow-up task after being merged. label Mar 25, 2021
yikeke pushed a commit that referenced this pull request Mar 25, 2021
@ti-srebot @IANTHEREAL
cherry pick #5832 to release-5.0 (#5840)
fd80a72 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Ian <[email protected]>
@IANTHEREAL IANTHEREAL deleted the binlog-limit branch March 25, 2021 12:36
@Joyinqin Joyinqin mentioned this pull request Mar 26, 2021
Merged
11 tasks
@yikeke yikeke removed the requires-followup This PR requires a follow-up task after being merged. label Mar 26, 2021
@yikeke yikeke mentioned this pull request Mar 26, 2021
Merged
9 tasks
@Joyinqin Joyinqin mentioned this pull request Mar 26, 2021
Merged
11 tasks
@Joyinqin
Copy link
Contributor

/translation done

@ti-chi-bot ti-chi-bot added the translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. label Mar 26, 2021
@Joyinqin
Copy link
Contributor

/remove-translation doing

@ti-chi-bot ti-chi-bot removed the translation/doing This PR’s assignee is translating this PR. label Mar 26, 2021
@ti-srebot ti-srebot mentioned this pull request Mar 29, 2021
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zier-one zier-one zier-one left review comments

@sticnarf sticnarf sticnarf approved these changes

@yikeke yikeke yikeke approved these changes

Assignees

@Joyinqin Joyinqin

Labels
size/S Denotes a PR that changes 10-29 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. status/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. v5.0 This PR/issue applies to TiDB v5.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@IANTHEREAL @ti-chi-bot @yikeke @ti-srebot @Joyinqin @sticnarf @zier-one