Skip to content

resolved_ts: return early after regions already had quorum (#11352)#11537

Merged
ti-chi-bot merged 3 commits intotikv:release-5.3from
ti-srebot:release-5.3-1e9f0b3a443c
Feb 21, 2022
Merged

resolved_ts: return early after regions already had quorum (#11352)#11537
ti-chi-bot merged 3 commits intotikv:release-5.3from
ti-srebot:release-5.3-1e9f0b3a443c

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Dec 2, 2021 •
edited
Loading

cherry-pick #11352 to release-5.3
You can switch your code base to this Pull Request by using git-extras:

# In tikv repo:
git pr https://github.com/tikv/tikv/pull/11537

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tikv.git pr/11537:release-5.3-1e9f0b3a443c

Signed-off-by: 5kbpers tangminghua@pingcap.com

What problem does this PR solve?

Issue Number: close #11351

Problem Summary:

What is changed and how it works?

What's Changed:

  • export region_resolved_ts_store from resolved_ts and import it in cdc
  • use select_all instead of join_all for returning early

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Release note 

Fix resolved ts lag increased after stoping a tikv

@ti-srebot
cherry pick tikv#11352 to release-5.3
31734f5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 2, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hicqu
  • longfangsong

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.

Details

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 2, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Dec 2, 2021
@ti-srebot ti-srebot mentioned this pull request Dec 2, 2021
Merged
@ti-srebot ti-srebot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. type/cherry-pick Type: PR - Cherry pick labels Dec 2, 2021
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Dec 2, 2021

@5kbpers you're already a collaborator in bot's repo.

resolve conflicts
7ce0594 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 10, 2021
@overvenus overvenus added the component/CDC Component: Change Data Capture label Feb 8, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 16, 2022
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Feb 16, 2022
@overvenus
Copy link
Member

overvenus commented Feb 21, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 21, 2022

@overvenus: 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.

Details

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
Member

ti-chi-bot commented Feb 21, 2022

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

DetailsCommit hash: 7ce0594

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 21, 2022
@overvenus
Copy link
Member

overvenus commented Feb 21, 2022

/test

@ti-chi-bot ti-chi-bot merged commit d67444b into tikv:release-5.3 Feb 21, 2022
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hicqu hicqu hicqu approved these changes

@liuzix liuzix Awaiting requested review from liuzix

@NingLin-P NingLin-P Awaiting requested review from NingLin-P

@overvenus overvenus Awaiting requested review from overvenus

+1 more reviewer

@longfangsong longfangsong longfangsong approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@5kbpers 5kbpers

Labels

cherry-pick-approved Cherry pick PR approved by release team. component/CDC Component: Change Data Capture release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick Type: PR - Cherry pick

Projects

None yet

Milestone

v5.3.1

Development

Successfully merging this pull request may close these issues.

8 participants

@ti-srebot @ti-chi-bot @overvenus @hicqu @longfangsong @purelind @5kbpers @zhouqiang-cl