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.

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 the config error in restore #2250

Merged
merged 15 commits into from
Apr 24, 2020
Merged

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Apr 21, 2020

What problem does this PR solve?

Fix the config error in restore

Related changes

  • Need to update the documentation

Does this PR introduce a user-facing change?:

Fix the config error in restore

fmt.Sprintf("--tidb-password=%s", ro.Password),
fmt.Sprintf("--tidb-host=%s", ro.Host),
fmt.Sprintf("--d=%s", restorePath),
"-status-addr=0.0.0.0:8289",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The options in the tidb-lightning chart are also with -- prefix, could you please double confirm the format?
https://github.com/pingcap/tidb-operator/blob/master/charts/tidb-lightning/templates/scripts/_start_lightning.sh.tpl#L28

shuijing198799
shuijing198799 previously approved these changes Apr 21, 2020
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@shuijing198799 shuijing198799 self-requested a review April 21, 2020 13:30
@Yisaer Yisaer requested a review from DanielZhangQD April 22, 2020 03:06
@@ -61,7 +61,8 @@ func (ro *Options) loadTidbClusterData(restorePath string) error {
"--status-addr=0.0.0.0:8289",
"--backend=tidb",
"--server-mode=false",
"–-log-file=",
"--log-file=",
"--tidb-port=4000",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use ro.Port.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated.

@Yisaer Yisaer requested a review from DanielZhangQD April 22, 2020 03:30
shuijing198799
shuijing198799 previously approved these changes Apr 22, 2020
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Yisaer Yisaer requested a review from shuijing198799 April 23, 2020 04:36
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@Yisaer
Copy link
Contributor Author

Yisaer commented Apr 23, 2020

/run-e2e-in-kind

@Yisaer Yisaer merged commit 7803907 into pingcap:master Apr 24, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 24, 2020

cherry pick to release-1.1 in PR #2282

Yisaer pushed a commit that referenced this pull request Apr 24, 2020
* fix the config error in restore
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-1.1 type/bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants