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

restore: merge small ranges (#578) #655

Merged
merged 9 commits into from
Jul 8, 2021
Merged

restore: merge small ranges (#578) #655

merged 9 commits into from
Jul 8, 2021

Conversation

ti-srebot
Copy link
Contributor

cherry-pick #578 to release-4.0

What problem does this PR solve?

Speed up restore by merging small range to reduce split and scatter.

What is changed and how it works?

Merge adjacent ranges that total_bytes is less 96MB or total_kv is less than 960000.

Check List

Tests

  • Integration test

Side effects

  • Breaking backward compatibility

Release Note

  • Speed up restore by merging small backup files.

@overvenus @ti-srebot
cherry pick pingcap#578 to release-4.0
d15d58c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Dec 24, 2020
Merged
@kennytm
Copy link
Collaborator

kennytm commented Dec 24, 2020

@overvenus please fix merge conflicts

@overvenus overvenus changed the base branch from release-4.0 to release-4.0-pending December 25, 2020 07:26
@overvenus
resolve conflict
b3a7e10 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus
Copy link
Member

/run-all-tests

kennytm
kennytm reviewed Dec 25, 2020
View reviewed changes
Copy link
Collaborator

@kennytm kennytm left a comment

Choose a reason for hiding this comment

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

lgtm

@ti-srebot ti-srebot added the status/LGT1 LGTM1 label Dec 25, 2020
@overvenus
Copy link
Member

/run-all-tests

@overvenus overvenus changed the base branch from release-4.0-pending to release-4.0 January 28, 2021 07:24
@overvenus overvenus added this to the v4.0.12 milestone Jan 28, 2021
@overvenus
Merge branch 'release-4.0' into pr/655
931de60 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@overvenus
Copy link
Member

@3pointer PTAL

@glorv
Copy link
Collaborator

glorv commented Mar 12, 2021

@overvenus Please resolve the conflict.

@overvenus
Merge branch 'release-4.0' of http://github.com/pingcap/br into pr/655
9e80ad5 
Signed-off-by: Neil Shen <overvenus@gmail.com>
@3pointer
Copy link
Collaborator

3pointer commented Jul 7, 2021

/run-integration-tests

2 similar comments
@3pointer
Copy link
Collaborator

3pointer commented Jul 7, 2021

/run-integration-tests

@3pointer
Copy link
Collaborator

3pointer commented Jul 7, 2021

/run-integration-tests

@lichunzhu lichunzhu requested review from lichunzhu and removed request for lichunzhu July 7, 2021 04:33
@3pointer
Copy link
Collaborator

3pointer commented Jul 8, 2021

/run-integration-tests

1 similar comment
@3pointer
Copy link
Collaborator

3pointer commented Jul 8, 2021

/run-integration-tests

@3pointer
Copy link
Collaborator

3pointer commented Jul 8, 2021

/LGTM

@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer

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 status/LGT2 LGTM2 and removed status/LGT1 LGTM1 labels Jul 8, 2021
@lonng lonng modified the milestones: v4.0.12, v4.0.14 Jul 8, 2021
@lonng
Copy link
Contributor

lonng commented Jul 8, 2021

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 9e80ad5

@3pointer
Copy link
Collaborator

3pointer commented Jul 8, 2021

/run-integration-tests

@ti-chi-bot ti-chi-bot merged commit f6559c4 into pingcap:release-4.0 Jul 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

@3pointer 3pointer 3pointer approved these changes

@lichunzhu lichunzhu Awaiting requested review from lichunzhu

Assignees
No one assigned
Labels
cherry-pick-approved component/restore size/XXL status/can-merge status/LGT2 LGTM2 type/performance type/4.0-cherry-pick
Projects
None yet
Milestone
v4.0.14
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@ti-srebot @kennytm @overvenus @glorv @3pointer @ti-chi-bot @lonng