Skip to content

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

Merged
zhouqiang-cl merged 8 commits intotikv:release-5.0from
ti-srebot:release-5.0-1e9f0b3a443c
Dec 21, 2021
Merged

resolved_ts: return early after regions already had quorum (#11352)#11538
zhouqiang-cl merged 8 commits intotikv:release-5.0from
ti-srebot:release-5.0-1e9f0b3a443c

Conversation

@ti-srebot
Copy link
Contributor

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

cherry-pick #11352 to release-5.0
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/11538

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

git push git@github.com:ti-srebot/tikv.git pr/11538:release-5.0-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-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hicqu
  • overvenus

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-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved do-not-merge/invalid-commit-message 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
Copy link
Contributor Author

ti-srebot commented Dec 2, 2021

/run-all-tests

@ti-chi-bot ti-chi-bot added 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 ti-srebot added this to the v5.0.5 milestone 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.

@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Dec 2, 2021
ref tikv#11351
6dfcd51 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@5kbpers 5kbpers force-pushed the release-5.0-1e9f0b3a443c branch from 0b9fd0c to 6dfcd51 Compare December 20, 2021 07:12
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed do-not-merge/invalid-commit-message size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 20, 2021
5kbpers added 4 commits December 20, 2021 15:28
add test
bc19555 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
fix build
8030418 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
delete test
ed73ba5 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
Merge branch 'release-5.0' into release-5.0-1e9f0b3a443c
9e9fd88
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 20, 2021
@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 Dec 20, 2021
@5kbpers 5kbpers force-pushed the release-5.0-1e9f0b3a443c branch 2 times, most recently from add05d3 to a5b82bd Compare December 20, 2021 12:03
replace mutex
b6fb74b 
Signed-off-by: 5kbpers <tangminghua@pingcap.com>
@5kbpers 5kbpers force-pushed the release-5.0-1e9f0b3a443c branch from a5b82bd to b6fb74b Compare December 20, 2021 12:20
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 20, 2021
@zhouqiang-cl
Copy link
Contributor

zhouqiang-cl commented Dec 20, 2021

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

@zhouqiang-cl: 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 Dec 20, 2021

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

DetailsCommit hash: 539d02f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 20, 2021

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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.

@zhouqiang-cl zhouqiang-cl merged commit d81e32a into tikv:release-5.0 Dec 21, 2021
@hicqu hicqu deleted the release-5.0-1e9f0b3a443c branch December 21, 2021 05:11
@zhouqiang-cl zhouqiang-cl modified the milestones: v5.0.5, v5.0.6 Dec 21, 2021
This was referenced Dec 22, 2021
Merged
Merged
sticnarf pushed a commit to ti-srebot/tikv that referenced this pull request Feb 8, 2022
@ti-srebot @sticnarf
resolved_ts: return early after regions already had quorum (tikv#11352)…
3c96747 
… (tikv#11538)

* ref tikv#11351

Signed-off-by: 5kbpers <tangminghua@pingcap.com>
Signed-off-by: Yilin Chen <sticnarf@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@overvenus overvenus overvenus approved these changes

@hicqu hicqu hicqu approved these changes

@liuzix liuzix Awaiting requested review from liuzix

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

Assignees

@5kbpers 5kbpers

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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.0.6

Development

Successfully merging this pull request may close these issues.

6 participants

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