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

br: Fix overlapped ranges #39496

Merged
merged 10 commits into from
Dec 1, 2022
Merged

br: Fix overlapped ranges #39496

merged 10 commits into from
Dec 1, 2022

Conversation

YuJuncen
Copy link
Contributor

What problem does this PR solve?

Issue Number: close #39494

Problem Summary:
This PR fixed a bug in overlapped, which would make overlapped cannot find all overlapped ranges if:

  • The range's start key is in a "hole" of the range tree.

What is changed and how it works?

We make a sane start key if cannot find proper first range.

Check List

Tests

  • Unit test

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fixed a bug that may cause PITR cannot work when TiCDC in cluster.

@YuJuncen
fixed cannot properly find overlapped ranges
d8c91a5 
Signed-off-by: hillium <yu745514916@live.com>
@YuJuncen
added more cases
d20ed9b 
Signed-off-by: hillium <yu745514916@live.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 30, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • Leavrth

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.

@ti-chi-bot ti-chi-bot added do-not-merge/invalid-title release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 30, 2022
@YuJuncen
added a more test
4db1937 
Signed-off-by: hillium <yu745514916@live.com>
@YuJuncen YuJuncen changed the title Fix overlapped ranges log-backup: Fix overlapped ranges Nov 30, 2022
@YuJuncen YuJuncen changed the title log-backup: Fix overlapped ranges br: Fix overlapped ranges Nov 30, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 30, 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 Nov 30, 2022
joccau
joccau approved these changes Nov 30, 2022
View reviewed changes
Copy link
Member

@joccau joccau left a comment

Choose a reason for hiding this comment

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

LGTM

@joccau
Copy link
Member

joccau commented Nov 30, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 4db1937

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 30, 2022
@YuJuncen
Copy link
Contributor Author

/merge

@hawkingrei
Copy link
Member

/run-check_dev
/run-check_dev_2

@hawkingrei
Copy link
Member

/run-check_dev_2

@AkiraXie
Copy link

AkiraXie commented Dec 1, 2022

/run-check_dev_2

@AkiraXie
Copy link

AkiraXie commented Dec 1, 2022

/run-check_dev_2

@ti-chi-bot ti-chi-bot merged commit 8bbf75d into pingcap:master Dec 1, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Dec 1, 2022

TiDB MergeCI notify

✅ Well Done! New fixed [1] after this pr merged.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci/integration-cdc-test 🔴 failed 1, success 39, total 40 25 min Existing failure
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 4 min 56 sec Existing failure
idc-jenkins-ci-tidb/common-test ✅ all 11 tests passed 11 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 26 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 26 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 57 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 5 min 43 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 4 min 25 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 37 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@3pointer 3pointer 3pointer approved these changes

@Leavrth Leavrth Leavrth approved these changes

@joccau joccau joccau approved these changes

Assignees
No one assigned
Labels
release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

br: pitr checkpoint cannot advance after upgrade
8 participants
@YuJuncen @ti-chi-bot @joccau @hawkingrei @AkiraXie @sre-bot @3pointer @Leavrth