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

br: split regions before pitr restore #39941

Merged
merged 22 commits into from
Jan 22, 2023
Merged

br: split regions before pitr restore #39941

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fc86974
draft
Leavrth Dec 13, 2022
895f9c2
Merge branch 'master' into split_regions_before_pitr_restore
Leavrth Dec 14, 2022
575afd5
draft
Leavrth Dec 14, 2022
e83213d
draft
Leavrth Dec 15, 2022
9fd60f8
fix some bugs and build error
Leavrth Dec 15, 2022
cf69bd7
draft
Leavrth Dec 16, 2022
d50c0f9
fix return
Leavrth Dec 16, 2022
9b949f4
scatter at the end
Leavrth Dec 16, 2022
6d16afd
fix unit test
Leavrth Dec 16, 2022
3bb5831
split more accurately
Leavrth Dec 19, 2022
39b1545
add unit test
Leavrth Dec 22, 2022
67e1f7b
fix the boundary problem
Leavrth Dec 27, 2022
0416eec
commit some suggestions
Leavrth Dec 28, 2022
e7504a4
adjust some factors
Leavrth Dec 30, 2022
3697c8c
split regions in parallel
Leavrth Jan 4, 2023
4159c1c
split order by new table id
Leavrth Jan 4, 2023
5cf2314
load split threshold from the tikv config
Leavrth Jan 6, 2023
e6d21f2
fix error when parse the split keys
Leavrth Jan 6, 2023
27bc740
fix lint
Leavrth Jan 17, 2023
c0179b3
add unit test
Leavrth Jan 19, 2023
a8eb546
fix lint
Leavrth Jan 19, 2023
80eab7c
Merge branch 'master' into split_regions_before_pitr_restore
ti-chi-bot Jan 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions br/pkg/restore/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ go_library(
"//util/collate",
"//util/hack",
"//util/mathutil",
"//util/sqlexec",
"//util/table-filter",
"@com_github_emirpasic_gods//maps/treemap",
"@com_github_go_sql_driver_mysql//:mysql",
Expand Down
13 changes: 13 additions & 0 deletions br/pkg/restore/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import (
"github.com/pingcap/tidb/util/codec"
"github.com/pingcap/tidb/util/collate"
"github.com/pingcap/tidb/util/mathutil"
"github.com/pingcap/tidb/util/sqlexec"
filter "github.com/pingcap/tidb/util/table-filter"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
Expand Down Expand Up @@ -1126,6 +1127,18 @@ func (rc *Client) SplitRanges(ctx context.Context,
return SplitRanges(ctx, rc, ranges, rewriteRules, updateCh, isRawKv)
}

func (rc *Client) WrapLogFilesIterWithSplitHelper(iter LogIter, rules map[int64]*RewriteRules, g glue.Glue, store kv.Storage) (LogIter, error) {
se, err := g.CreateSession(store)
if err != nil {
return nil, errors.Trace(err)
}
execCtx := se.GetSessionCtx().(sqlexec.RestrictedSQLExecutor)
splitSize, splitKeys := utils.GetRegionSplitInfo(execCtx)
log.Info("get split threshold from tikv config", zap.Uint64("split-size", splitSize), zap.Int64("split-keys", splitKeys))
client := split.NewSplitClient(rc.GetPDClient(), rc.GetTLSConfig(), false)
return NewLogFilesIterWithSplitHelper(iter, rules, client, splitSize, splitKeys), nil
}

// RestoreSSTFiles tries to restore the files.
func (rc *Client) RestoreSSTFiles(
ctx context.Context,
Expand Down
Loading