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.

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

txn: Check whether the primary matches when handling check_txn_status requests (#14637) #14659

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #14637

What is changed and how it works?

Issue Number: close #14636
ref pingcap/tidb#42937
Requires pingcap/kvproto#1105
Requires pingcap/kvproto#1107

What's Changed:

Makes TiKV support checking whether the lock is primary when handling check_txn_status.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note

None

close tikv#14636, ref pingcap/tidb#42937

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Apr 26, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • zyguan

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 submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@cfzjywxk
Copy link
Collaborator

cfzjywxk commented May 8, 2023

@MyonKeminta
Need to resolve the conflicts.

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Status: PR - There is already 1 approval label May 10, 2023
Signed-off-by: zyguan <zhongyangguan@gmail.com>
@zyguan
Copy link
Contributor

zyguan commented May 10, 2023

/cherry-pick-invite

@ti-chi-bot
Copy link
Member Author

@zyguan Please accept the invitation then you can push to the cherry-pick pull requests.
Comment with "/cherry-pick-invite" if the invitation is expired.
https://github.com/ti-chi-bot/tikv/invitations

Signed-off-by: zyguan <zhongyangguan@gmail.com>
@ti-chi-bot ti-chi-bot bot removed the needs-rebase label May 10, 2023
@zyguan
Copy link
Contributor

zyguan commented May 10, 2023

/test

@ti-chi-bot ti-chi-bot bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels May 10, 2023
@cfzjywxk
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 10, 2023

@cfzjywxk: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

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.

@ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented May 10, 2023

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

Commit hash: 080a0c3

@ti-chi-bot ti-chi-bot bot added the status/can-merge Status: Can merge to base branch label May 10, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels May 10, 2023
@ti-chi-bot ti-chi-bot bot merged commit 6bb30c5 into tikv:release-7.1 May 10, 2023
1 check passed
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none size/L status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals type/cherry-pick-for-release-7.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants