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

Add data description for encoding JSON in case of error

Browse Source 
Signed-off-by: Nolan Brubaker <brubakern@vmware.com>
This commit is contained in:
Nolan Brubaker
2020-04-16 15:42:57 -04:00
parent d31951c81c
commit b567859655
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/controller/backup_controller.go
View File

@@ -649,27 +649,27 @@ func persistBackup(backup *pkgbackup.Request,
}
// Velero-native volume snapshots (as opposed to CSI ones)
nativeVolumeSnapshots, err := encodeToJSONGzip(backup.VolumeSnapshots)
nativeVolumeSnapshots, err := encodeToJSONGzip(backup.VolumeSnapshots, "native volumesnapshots list")
if err != nil {
errs = append(errs, err)
}
podVolumeBackups, err := encodeToJSONGzip(backup.PodVolumeBackups)
podVolumeBackups, err := encodeToJSONGzip(backup.PodVolumeBackups, "pod volume backups list")
if err != nil {
errs = append(errs, err)
}
csiSnapshotJSON, err := encodeToJSONGzip(csiVolumeSnapshots)
csiSnapshotJSON, err := encodeToJSONGzip(csiVolumeSnapshots, "csi volume snapshots list")
if err != nil {
errs = append(errs, err)
}
snapshotContentsJSON, err := encodeToJSONGzip(volumeSnapshotContents)
snapshotContentsJSON, err := encodeToJSONGzip(volumeSnapshotContents, "volume snapshot contents list")
if err != nil {
errs = append(errs, err)
}
backupResourceList, err := encodeToJSONGzip(backup.BackupResourceList())
backupResourceList, err := encodeToJSONGzip(backup.BackupResourceList(), "backup resources list")
if err != nil {
errs = append(errs, err)
}
@@ -711,13 +711,13 @@ func closeAndRemoveFile(file *os.File, log logrus.FieldLogger) {
}
}
// encodeToJSONGzip takes arbitrary Go data and encodes it to GZip compressed JSON in a buffer.
func encodeToJSONGzip(data interface{}) (*bytes.Buffer, error) {
// encodeToJSONGzip takes arbitrary Go data and encodes it to GZip compressed JSON in a buffer, as well as a description of the data to put into an error should encoding fail.
func encodeToJSONGzip(data interface{}, desc string) (*bytes.Buffer, error) {
buf := new(bytes.Buffer)
gzw := gzip.NewWriter(buf)
if err := json.NewEncoder(gzw).Encode(data); err != nil {
return nil, errors.Wrap(err, "error encoding data")
return nil, errors.Wrapf(err, "error encoding %s", desc)
}
if err := gzw.Close(); err != nil {
return nil, errors.Wrap(err, "error closing gzip writer")