mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-03 03:35:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Restic restore fixes (#2013)

Browse Source 
* restic: use restore cmd's env when getting snapshot size

Signed-off-by: Steve Kriss <krisss@vmware.com>

* restic: remove code that considers 0-byte backups an error

Signed-off-by: Steve Kriss <krisss@vmware.com>
This commit is contained in:
Steve Kriss
2019-10-29 08:42:12 -06:00
committed by KubeKween
parent 5d6b129ea5
commit 83752d28d7
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/restic/exec_commands.go
View File

@@ -179,9 +179,9 @@ func getSummaryLine(b []byte) ([]byte, error) {
// RunRestore runs a `restic restore` command and monitors the volume size to
// provide progress updates to the caller.
func RunRestore(restoreCmd *Command, log logrus.FieldLogger, updateFunc func(velerov1api.PodVolumeOperationProgress)) (string, string, error) {
snapshotSize, err := getSnapshotSize(restoreCmd.RepoIdentifier, restoreCmd.PasswordFile, restoreCmd.Args[0])
snapshotSize, err := getSnapshotSize(restoreCmd.RepoIdentifier, restoreCmd.PasswordFile, restoreCmd.Args[0], restoreCmd.Env)
if err != nil {
return "", "", err
return "", "", errors.Wrap(err, "error getting snapshot size")
}
updateFunc(velerov1api.PodVolumeOperationProgress{
@@ -225,8 +225,9 @@ func RunRestore(restoreCmd *Command, log logrus.FieldLogger, updateFunc func(vel
return stdout, stderr, err
}
func getSnapshotSize(repoIdentifier, passwordFile, snapshotID string) (int64, error) {
func getSnapshotSize(repoIdentifier, passwordFile, snapshotID string, env []string) (int64, error) {
cmd := StatsCommand(repoIdentifier, passwordFile, snapshotID)
cmd.Env = env
stdout, stderr, err := exec.RunCommand(cmd.Cmd())
if err != nil {
@@ -241,10 +242,6 @@ func getSnapshotSize(repoIdentifier, passwordFile, snapshotID string) (int64, er
return 0, errors.Wrap(err, "error unmarshalling restic stats result")
}
if snapshotStats.TotalSize == 0 {
return 0, errors.Errorf("error getting snapshot size %+v", snapshotStats)
}
return snapshotStats.TotalSize, nil
}