Skip to content

br: PiTR restore batch apply kv-files#38772

Merged
ti-chi-bot merged 33 commits intopingcap:masterfrom
joccau:enhance-restore-kvfiles
Nov 22, 2022
Merged

br: PiTR restore batch apply kv-files#38772
ti-chi-bot merged 33 commits intopingcap:masterfrom
joccau:enhance-restore-kvfiles

Conversation

@joccau
Copy link
Contributor

@joccau joccau commented Oct 31, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: close #38211

Problem Summary:

What is changed and how it works?

  • PITR support applying kv-files into tikv with batch method.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

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

Support restoring a batch of kv-files when pitr to down-cluster.

joccau added 5 commits October 19, 2022 11:16
replace kvproto for joccau/kvproto
bbaa187 
Signed-off-by: joccau <zak.zhao@pingcap.com>
restore a batch of kv-files in one RPC
323287c 
Signed-off-by: joccau <zak.zhao@pingcap.com>
for compatibility with old requests
b7547e1 
Signed-off-by: joccau <zak.zhao@pingcap.com>
Merge branch 'master' into enhance-restore-kvfiles
116cf10
make compatibility for br and tikv between new and old version.
188a29a 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 31, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Leavrth
  • YuJuncen

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-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 31, 2022
@joccau joccau added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. component/br This issue is related to BR of TiDB. labels Oct 31, 2022
@ti-chi-bot ti-chi-bot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Oct 31, 2022
joccau added 2 commits November 3, 2022 18:29
retry send apply rpc when receive the error(sever is busy)
efff293 
Signed-off-by: joccau <zak.zhao@pingcap.com>
support flags for pitr batch count and batch size
bc9ee84 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the enhance-restore-kvfiles branch from 1b58fba to bc9ee84 Compare November 7, 2022 15:49
set more retry times when scan regions
d4581b3 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the enhance-restore-kvfiles branch 2 times, most recently from 4254278 to a7eb998 Compare November 13, 2022 14:12
@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 Nov 13, 2022
@joccau joccau force-pushed the enhance-restore-kvfiles branch from a7eb998 to bffdf5e Compare November 14, 2022 01:46
add test case
9de3343 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau force-pushed the enhance-restore-kvfiles branch from bffdf5e to 9de3343 Compare November 14, 2022 07:47
update kvproto
8eb3c0a 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau joccau changed the title br: PiTR restore batch apply kv-files(WIP) br: PiTR restore batch apply kv-files Nov 14, 2022
@joccau joccau force-pushed the enhance-restore-kvfiles branch from dd41789 to eda5a08 Compare November 14, 2022 11:00
make lint
9992962 
Signed-off-by: joccau <zak.zhao@pingcap.com>
Leavrth
Leavrth approved these changes Nov 22, 2022
View reviewed changes
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 22, 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 22, 2022
joccau and others added 4 commits November 22, 2022 11:22
deal comments
02fe93a 
Signed-off-by: joccau <zak.zhao@pingcap.com>
add log
d90e199 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Merge branch 'master' into enhance-restore-kvfiles
d43b33f
make lint
6c84265 
Signed-off-by: joccau <zak.zhao@pingcap.com>
@joccau
Copy link
Contributor Author

joccau commented Nov 22, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 22, 2022

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

DetailsCommit hash: 6c84265

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

joccau commented Nov 22, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 22, 2022

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

DetailsCommit hash: 2fa5802

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

joccau commented Nov 22, 2022

/run-check_dev_2

@ti-chi-bot ti-chi-bot merged commit 2103466 into pingcap:master Nov 22, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Nov 22, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [1] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/common-test 🟥 failed 1, success 10, total 11 10 min New failing
idc-jenkins-ci/integration-cdc-test 🔴 failed 1, success 38, total 39 18 min Existing failure
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 11 min Existing failure
idc-jenkins-ci-tidb/sqllogic-test-1 ✅ all 26 tests passed 6 min 30 sec Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 27 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 41 sec Existing passed
idc-jenkins-ci-tidb/integration-ddl-test 🟢 all 6 tests passed 6 min 16 sec Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 5 min 50 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 41 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

This was referenced Nov 22, 2022
Closed
Closed
@joccau joccau deleted the enhance-restore-kvfiles branch January 10, 2023 02:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@Leavrth Leavrth Leavrth approved these changes

@3pointer 3pointer Awaiting requested review from 3pointer

Assignees

No one assigned

Labels

component/br This issue is related to BR of TiDB. 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/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 restore log data too slow, and the speed is 8.14 GB/H per tikv

5 participants

@joccau @ti-chi-bot @sre-bot @YuJuncen @Leavrth