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

lightning: convert pebbleDB block size to default when user passes in 0 (#50690) #50717

Closed
wants to merge 3 commits into from
Closed

lightning: convert pebbleDB block size to default when user passes in 0 (#50690) #50717

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
0773871
This is an automated cherry-pick of #50690
lyzx2001 Jan 25, 2024
bc2113f
update
lyzx2001 Jan 25, 2024
388370c
update
lyzx2001 Jan 25, 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
36 changes: 29 additions & 7 deletions MODULE.bazel.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion br/pkg/lightning/config/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ go_test(
],
embed = [":config"],
flaky = True,
shard_count = 47,
shard_count = 48,
deps = [
"//br/pkg/lightning/common",
"@com_github_burntsushi_toml//:toml",
Expand Down
4 changes: 4 additions & 0 deletions br/pkg/lightning/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const (

DefaultEngineMemCacheSize = 512 * units.MiB
DefaultLocalWriterMemCacheSize = 128 * units.MiB
DefaultBlockSize = 16 * units.KiB

defaultCSVDataCharacterSet = "binary"
defaultCSVDataInvalidCharReplace = utf8.RuneError
Expand Down Expand Up @@ -1115,6 +1116,9 @@ func (t *TikvImporter) adjust() error {
if t.LocalWriterMemCacheSize == 0 {
t.LocalWriterMemCacheSize = DefaultLocalWriterMemCacheSize
}
if t.BlockSize == 0 {
t.BlockSize = DefaultBlockSize
}

if t.ParallelImport && t.AddIndexBySQL {
return common.ErrInvalidConfig.
Expand Down
13 changes: 13 additions & 0 deletions br/pkg/lightning/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,3 +1299,16 @@ func TestAdjustConflict(t *testing.T) {
cfg.Conflict.MaxRecordRows = 1
require.ErrorContains(t, cfg.Conflict.adjust(&cfg.TikvImporter, &cfg.App), `cannot record duplication (conflict.max-record-rows > 0) when use tikv-importer.backend = "tidb" and conflict.strategy = "replace"`)
}

func TestAdjustBlockSize(t *testing.T) {
cfg := NewConfig()
cfg.TikvImporter.Backend = BackendLocal
cfg.TikvImporter.SortedKVDir = "."
cfg.TiDB.DistSQLScanConcurrency = 1
cfg.Mydumper.SourceDir = "."
cfg.TikvImporter.BlockSize = 0

err := cfg.Adjust(context.Background())
require.Error(t, err)
require.Equal(t, ByteSize(16384), cfg.TikvImporter.BlockSize)
}
1 change: 1 addition & 0 deletions pkg/executor/importer/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1279,6 +1279,7 @@ func (e *LoadDataController) getLocalBackendCfg(pdAddr, dataDir string) local.Ba
KeyspaceName: tidb.GetGlobalKeyspaceName(),
PausePDSchedulerScope: config.PausePDSchedulerScopeTable,
DisableAutomaticCompactions: true,
BlockSize: config.DefaultBlockSize,
}
if e.IsRaftKV2 {
backendConfig.RaftKV2SwitchModeDuration = config.DefaultSwitchTiKVModeInterval
Expand Down
Loading