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

don't fail the restore if cleanup of the staging directory post-restore fails

Browse Source 
Signed-off-by: Steve Kriss <steve@heptio.com>
This commit is contained in:
Steve Kriss
2018-06-11 09:48:26 -07:00
parent 6897c2f901
commit 2c6fc5bd90
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/pod_volume_restore_controller.go
View File

@@ -339,10 +339,11 @@ func restorePodVolume(req *arkv1api.PodVolumeRestore, credsFile, volumeDir strin
return errors.Wrapf(err, "error moving files from restore staging directory into volume")
}
// The staging directory should be empty at this point since we moved everything, but
// make sure.
// Remove staging directory (which should be empty at this point) from daemonset pod.
// Don't fail the restore if this returns an error, since the actual directory content
// has already successfully been moved into the pod volume.
if err := os.RemoveAll(restorePath); err != nil {
return errors.Wrap(err, "error removing restore staging directory and its contents")
log.WithError(err).Warnf("error removing staging directory %s for pod volume restore %s/%s", restorePath, req.Namespace, req.Name)
}
var restoreUID types.UID