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

Merged
merged 12 commits into from
Apr 24, 2020
+3 −1
Merged

Fix the config error in restore (#2250) #2282

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
47abc9b
fix the config error in restore
Apr 21, 2020
a7b2294
Update restore.go
Apr 21, 2020
e9fe19c
remove log
Apr 22, 2020
83cd6b1
go fmt
Apr 22, 2020
5b43ebf
revert change
Apr 22, 2020
dcd5371
address the comment
Apr 22, 2020
acfdaaf
Update restore.go
Apr 22, 2020
4f27131
add note
Apr 22, 2020
e8bc31f
Update restore.go
Apr 22, 2020
e758e30
add logfile
Apr 22, 2020
1776ac0
Merge branch 'release-1.1' into release-1.1-780390756a07
Yisaer Apr 24, 2020
bfffe03
Merge branch 'release-1.1' into release-1.1-780390756a07
Yisaer Apr 24, 2020
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: 3 additions & 1 deletion cmd/backup-manager/app/import/restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,17 @@ func (ro *Options) loadTidbClusterData(restorePath string) error {
if exist := util.IsDirExist(restorePath); !exist {
return fmt.Errorf("dir %s does not exist or is not a dir", restorePath)
}
// args for restore
args := []string{
"--status-addr=0.0.0.0:8289",
"--backend=tidb",
"--server-mode=false",
"–-log-file=",
"--log-file=",
fmt.Sprintf("--tidb-user=%s", ro.User),
fmt.Sprintf("--tidb-password=%s", ro.Password),
fmt.Sprintf("--tidb-host=%s", ro.Host),
fmt.Sprintf("--d=%s", restorePath),
fmt.Sprintf("--tidb-port=%d", ro.Port),
}

output, err := exec.Command("/tidb-lightning", args...).CombinedOutput()
Expand Down