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: use a limited workpool #51872

Merged
merged 3 commits into from
Mar 26, 2024
Merged

restore: use a limited workpool #51872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e14cd5d
use a limited workpool
3pointer Mar 19, 2024
61092ea
add some comments
3pointer Mar 21, 2024
0861bd5
update comment
3pointer Mar 26, 2024
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
12 changes: 11 additions & 1 deletion br/pkg/restore/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,6 +667,16 @@ func (rc *Client) GetFilesInRawRange(startKey []byte, endKey []byte, cf string)
// SetConcurrency sets the concurrency of dbs tables files.
func (rc *Client) SetConcurrency(c uint) {
log.Info("download worker pool", zap.Uint("size", c))
if rc.granularity == string(CoarseGrained) {
// we believe 32 is large enough for download worker pool.
// it won't reach the limit if sst files distribute evenly.
// when restore memory usage is still too high, we should reduce concurrencyPerStore
// to sarifice some speed to reduce memory usage.
count := uint(rc.storeCount) * rc.concurrencyPerStore * 32
log.Info("download coarse worker pool", zap.Uint("size", count))
rc.workerPool = utils.NewWorkerPool(count, "file")
return
}
rc.workerPool = utils.NewWorkerPool(c, "file")
}

Expand Down Expand Up @@ -1544,8 +1554,8 @@ LOOPFORTABLE:
// wait for download worker notified
rc.fileImporter.cond.Wait()
}
eg.Go(restoreFn)
rc.fileImporter.cond.L.Unlock()
rc.workerPool.ApplyOnErrorGroup(eg, restoreFn)
} else {
// if we are not use coarse granularity which means
// we still pipeline split & scatter regions and import sst files
Expand Down
4 changes: 2 additions & 2 deletions br/pkg/task/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ func (cfg *RestoreCommonConfig) adjust() {
func DefineRestoreCommonFlags(flags *pflag.FlagSet) {
// TODO remove experimental tag if it's stable
flags.Bool(flagOnline, false, "(experimental) Whether online when restore")
flags.String(flagGranularity, string(restore.FineGrained), "(experimental) Whether split & scatter regions using fine-grained way during restore")
flags.Uint(flagConcurrencyPerStore, 128, "(experimental) The size of thread pool on each store that executes tasks")
flags.String(flagGranularity, string(restore.FineGrained), "Whether split & scatter regions using fine-grained way during restore")
flags.Uint(flagConcurrencyPerStore, 128, "The size of thread pool on each store that executes tasks, only enabled when `--granularity=coarse-grained`")
flags.Uint32(flagConcurrency, 128, "(deprecated) The size of thread pool on BR that executes tasks, "+
"where each task restores one SST file to TiKV")
flags.Uint64(FlagMergeRegionSizeBytes, conn.DefaultMergeRegionSizeBytes,
Expand Down
Loading