Skip to content

cdc: pick some fixes from master#11632

Merged
hicqu merged 5 commits intotikv:release-5.3-20211210from
hicqu:release-5.3-20211210
Dec 10, 2021
Merged

cdc: pick some fixes from master#11632
hicqu merged 5 commits intotikv:release-5.3-20211210from
hicqu:release-5.3-20211210

Conversation

@hicqu
Copy link
Contributor

@hicqu hicqu commented Dec 10, 2021

What is changed and how it works?

Cherry pick #11352 , #11388 , #11385 , #11465 into the base branch.

And cherry pick PR #11615 into the base branch.

Related changes

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

Check List

Tests

Side effects

Release note 

Please add a release note.
None

5kbpers and others added 5 commits December 10, 2021 15:26
@hicqu @liuzix @ti-chi-bot
resolved_ts: return early after regions already had quorum (tikv#11352)
3dd898f 
* close tikv#11351

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

* fix tests

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

* fix tests

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

* Apply suggestions from code review

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

Co-authored-by: Zixiong Liu <liuzixiong@pingcap.com>

* address comments

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

* make clippy happy

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

* close tikv#11400

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

Co-authored-by: qupeng <qupeng@pingcap.com>
Co-authored-by: Zixiong Liu <liuzixiong@pingcap.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@hicqu
Support to iterate table properties for KvEngine (tikv#11388)
6fa0f38 
* support to iterate table properties for KvEngine
* close tikv#11387

Signed-off-by: qupeng <qupeng@pingcap.com>
@hicqu
cdc: introduce TsFilter into incremental scan (tikv#11385)
73d2e48 
* close tikv#11384

Signed-off-by: qupeng <qupeng@pingcap.com>
@hicqu @ti-chi-bot
support to get approximate keys and size for a given range from UserC…
3c9f61b 
…ollectedProperties (tikv#11465)

Signed-off-by: qupeng <qupeng@pingcap.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@hicqu
cherry pick pr tikv#11615
e32267a 
Signed-off-by: qupeng <qupeng@pingcap.com>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • liuzix
  • 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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Dec 10, 2021
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 10, 2021

@hicqu: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 10, 2021
@hicqu hicqu requested review from liuzix and overvenus December 10, 2021 07:42
@overvenus
Copy link
Member

overvenus commented Dec 10, 2021

/run-integration-cdc-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 10, 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 10, 2021
@hicqu
Copy link
Contributor Author

hicqu commented Dec 10, 2021

/test

@hicqu hicqu merged commit b3a6200 into tikv:release-5.3-20211210 Dec 10, 2021
@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

@overvenus overvenus overvenus approved these changes

+1 more reviewer

@liuzix liuzix liuzix approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2.

Projects

None yet

Milestone

v5.3.1

Development

Successfully merging this pull request may close these issues.

5 participants

@hicqu @ti-chi-bot @overvenus @liuzix @purelind