vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix restore cmd extraflag overwrite bug 

Signed-off-by: Ming <mqiu@vmware.com>
pull/5347/head
Ming 2022-09-15 04:02:53 +00:00
parent 8888f8765e
commit 4022020d5f
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/5347-qiuming-best Normal file
View File

@ -0,0 +1 @@
Fix restore cmd extraflag overwrite bug

26
pkg/uploader/provider/restic.go
View File

@ -91,11 +91,18 @@ func NewResticUploaderProvider(
}
func (rp *resticProvider) Close(ctx context.Context) error {
if err := os.Remove(rp.credentialsFile); err != nil {
rp.log.Warnf("Failed to remove file %s with err %v", rp.credentialsFile, err)
_, err := os.Stat(rp.credentialsFile)
if err == nil {
return os.Remove(rp.credentialsFile)
} else if !os.IsNotExist(err) {
return errors.Errorf("failed to get file %s info with error %v", rp.credentialsFile, err)
}
if err := os.Remove(rp.caCertFile); err != nil {
rp.log.Warnf("Failed to remove file %s with err %v", rp.caCertFile, err)
_, err = os.Stat(rp.caCertFile)
if err == nil {
return os.Remove(rp.caCertFile)
} else if !os.IsNotExist(err) {
return errors.Errorf("failed to get file %s info with error %v", rp.caCertFile, err)
}
return nil
}
@ -134,7 +141,7 @@ func (rp *resticProvider) RunBackup(
log.Debugf("Restic backup got empty dir with %s path", path)
return "", true, nil
}
return "", false, errors.WithStack(fmt.Errorf("error running restic backup with error: %v", err))
return "", false, errors.WithStack(fmt.Errorf("error running restic backup command %s with error: %v stderr: %v", backupCmd.String(), err, stderrBuf))
}
// GetSnapshotID
snapshotIdCmd := restic.GetSnapshotCommand(rp.repoIdentifier, rp.credentialsFile, tags)
@ -145,7 +152,7 @@ func (rp *resticProvider) RunBackup(
if err != nil {
return "", false, errors.WithStack(fmt.Errorf("error getting snapshot id with error: %v", err))
}
log.Debugf("Run command=%s, stdout=%s, stderr=%s", backupCmd.String(), summary, stderrBuf)
log.Infof("Run command=%s, stdout=%s, stderr=%s", backupCmd.String(), summary, stderrBuf)
return snapshotID, false, nil
}
@ -167,10 +174,11 @@ func (rp *resticProvider) RunRestore(
restoreCmd := ResticRestoreCMDFunc(rp.repoIdentifier, rp.credentialsFile, snapshotID, volumePath)
restoreCmd.Env = rp.cmdEnv
restoreCmd.CACertFile = rp.caCertFile
restoreCmd.ExtraFlags = rp.extraFlags
if len(rp.extraFlags) != 0 {
restoreCmd.ExtraFlags = append(restoreCmd.ExtraFlags, rp.extraFlags...)
}
stdout, stderr, err := restic.RunRestore(restoreCmd, log, updater)
log.Debugf("Run command=%s, stdout=%s, stderr=%s", restoreCmd.Command, stdout, stderr)
log.Infof("Run command=%s, stdout=%s, stderr=%s", restoreCmd.Command, stdout, stderr)
return err
}