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

Fix TiKV config check false alarm when data_dir is depended on #1471

Merged
merged 7 commits into from
Jul 6, 2021
Merged

Fix TiKV config check false alarm when data_dir is depended on #1471

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
941c8a1
Fix TiKV config check false alarm
tabokie Jul 5, 2021
6f2d647
minor fix
tabokie Jul 5, 2021
1f033d5
Fix param passing
tabokie Jul 5, 2021
5080974
minor fix
tabokie Jul 5, 2021
6e38093
Address comment
tabokie Jul 5, 2021
4c90e94
Consistent with normal run
tabokie Jul 5, 2021
f713108
Merge branch 'master' into patch-1
tabokie Jul 6, 2021
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
4 changes: 2 additions & 2 deletions pkg/cluster/spec/server_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,10 @@ func checkConfig(ctx context.Context, e ctxt.Executor, componentName, clusterVer
return nil
}

// Hack tikv --pd flag
extra := ""
if componentName == ComponentTiKV {
extra = `--pd=""`
// Pass in an empty pd address and the correct data dir
extra = fmt.Sprintf(`--pd "" --data-dir "%s"`, paths.Data[0])
}
cmd = fmt.Sprintf("%s --config-check --config=%s %s", binPath, configPath, extra)
}
Expand Down