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

csi data mover backup describe

Browse Source 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
Lyndon-Li
2023-12-05 17:14:49 +08:00
parent ac5d030ab4
commit 72fcd84a51
4 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
pkg/cmd/util/output/backup_describer.go
View File

@@ -40,10 +40,11 @@ import (
"github.com/vmware-tanzu/velero/pkg/features"
"github.com/vmware-tanzu/velero/pkg/itemoperation"
"github.com/vmware-tanzu/velero/internal/volume"
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
"github.com/vmware-tanzu/velero/pkg/util/collections"
"github.com/vmware-tanzu/velero/pkg/util/results"
"github.com/vmware-tanzu/velero/pkg/volume"
nativesnap "github.com/vmware-tanzu/velero/pkg/volume"
)
// DescribeBackup describes a backup in human-readable format.
@@ -463,18 +464,18 @@ func describeBackupVolumes(ctx context.Context, kbClient kbclient.Client, d *Des
d.Printf("\t<error getting backup volume info: %v>\n", err)
return
} else {
var volumeInfos *volume.VolumeInfos
var volumeInfos []volume.VolumeInfo
if err := json.NewDecoder(buf).Decode(&volumeInfos); err != nil {
d.Printf("\t<error reading backup volume info: %v>\n", err)
return
}
for i := range volumeInfos.VolumeInfos {
switch volumeInfos.VolumeInfos[i].BackupMethod {
for i := range volumeInfos {
switch volumeInfos[i].BackupMethod {
case volume.NativeSnapshot:
nativeSnapshots = append(nativeSnapshots, &volumeInfos.VolumeInfos[i])
nativeSnapshots = append(nativeSnapshots, &volumeInfos[i])
case volume.CSISnapshot:
csiSnapshots = append(csiSnapshots, &volumeInfos.VolumeInfos[i])
csiSnapshots = append(csiSnapshots, &volumeInfos[i])
}
}
}
@@ -486,7 +487,6 @@ func describeBackupVolumes(ctx context.Context, kbClient kbclient.Client, d *Des
d.Println()
describePodVolumeBackups(d, details, podVolumeBackupCRs)
d.Println()
}
func retrieveNativeSnapshotLegacy(ctx context.Context, kbClient kbclient.Client, backup *velerov1api.Backup, insecureSkipTLSVerify bool, caCertPath string) ([]*volume.VolumeInfo, error) {
@@ -502,7 +502,7 @@ func retrieveNativeSnapshotLegacy(ctx context.Context, kbClient kbclient.Client,
return nativeSnapshots, errors.Wrapf(err, "error to download native snapshot info")
}
var snapshots []*volume.Snapshot
var snapshots []*nativesnap.Snapshot
if err := json.NewDecoder(buf).Decode(&snapshots); err != nil {
return nativeSnapshots, errors.Wrapf(err, "error to decode native snapshot info")
}
@@ -528,12 +528,17 @@ func retrieveNativeSnapshotLegacy(ctx context.Context, kbClient kbclient.Client,
}
func retrieveCSISnapshotLegacy(ctx context.Context, kbClient kbclient.Client, backup *velerov1api.Backup, insecureSkipTLSVerify bool, caCertPath string) ([]*volume.VolumeInfo, error) {
status := backup.Status
csiSnapshots := []*volume.VolumeInfo{}
if !features.IsEnabled(velerov1api.CSIFeatureFlag) {
return csiSnapshots, nil
}
if status.CSIVolumeSnapshotsAttempted == 0 {
return csiSnapshots, nil
}
vsBuf := new(bytes.Buffer)
err := downloadrequest.Stream(ctx, kbClient, backup.Namespace, backup.Name, velerov1api.DownloadTargetKindCSIBackupVolumeSnapshots, vsBuf, downloadRequestTimeout, insecureSkipTLSVerify, caCertPath)
if err != nil {
@@ -552,12 +557,13 @@ func retrieveCSISnapshotLegacy(ctx context.Context, kbClient kbclient.Client, ba
}
var vscList []snapshotv1api.VolumeSnapshotContent
if err := json.NewDecoder(vsBuf).Decode(&vscList); err != nil {
if err := json.NewDecoder(vscBuf).Decode(&vscList); err != nil {
return csiSnapshots, errors.Wrapf(err, "error to decode vsc list")
}
for _, vsc := range vscList {
volInfo := volume.VolumeInfo{
PreserveLocalSnapshot: true,
CSISnapshotInfo: volume.CSISnapshotInfo{
VSCName: vsc.Name,
Driver: vsc.Spec.Driver,
@@ -573,7 +579,7 @@ func retrieveCSISnapshotLegacy(ctx context.Context, kbClient kbclient.Client, ba
}
for _, vs := range vsList {
if vs.Spec.Source.VolumeSnapshotContentName == nil {
if vs.Status.BoundVolumeSnapshotContentName == nil {
continue
}
@@ -581,7 +587,7 @@ func retrieveCSISnapshotLegacy(ctx context.Context, kbClient kbclient.Client, ba
continue
}
if *vs.Spec.Source.VolumeSnapshotContentName == vsc.Name {
if *vs.Status.BoundVolumeSnapshotContentName == vsc.Name {
volInfo.PVCName = *vs.Spec.Source.PersistentVolumeClaimName
}
}
@@ -650,7 +656,7 @@ func describeLocalSnapshot(d *Describer, details bool, info *volume.VolumeInfo)
if details {
d.Printf("\t\t\tSnapshot:\n")
if !info.SnapshotDataMoved {
if !info.SnapshotDataMoved && info.OperationID != "" {
d.Printf("\t\t\t\tOperation ID: %s\n", info.OperationID)
}
@@ -761,6 +767,7 @@ func describePodVolumeBackups(d *Describer, details bool, podVolumeBackups []vel
if len(podVolumeBackups) > 0 {
uploaderType = podVolumeBackups[0].Spec.UploaderType
} else {
d.Printf("\tPod Volume Backups: <none included>\n")
return
}

5
pkg/cmd/util/output/backup_describer_test.go
View File

@@ -6,9 +6,9 @@ import (
"text/tabwriter"
"time"
"github.com/vmware-tanzu/velero/internal/volume"
"github.com/vmware-tanzu/velero/pkg/features"
"github.com/vmware-tanzu/velero/pkg/itemoperation"
"github.com/vmware-tanzu/velero/pkg/volume"
"github.com/stretchr/testify/require"
@@ -544,7 +544,8 @@ func TestDescribePodVolumeBackups(t *testing.T) {
name: "empty list",
inputPVBList: []velerov1api.PodVolumeBackup{},
inputDetails: true,
expect: ``,
expect: ` Pod Volume Backups: <none included>
`,
},
{
name: "2 completed pvbs no details",

15
pkg/cmd/util/output/backup_structured_describer.go
View File

@@ -28,12 +28,12 @@ import (
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
"github.com/vmware-tanzu/velero/internal/volume"
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
"github.com/vmware-tanzu/velero/pkg/cmd/util/downloadrequest"
"github.com/vmware-tanzu/velero/pkg/features"
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
"github.com/vmware-tanzu/velero/pkg/util/results"
"github.com/vmware-tanzu/velero/pkg/volume"
)
// DescribeBackupInSF describes a backup in structured format.
@@ -330,18 +330,18 @@ func describeBackupVolumesInSF(ctx context.Context, kbClient kbclient.Client, ba
backupVolumes["errorGetBackupVolumeInfo"] = fmt.Sprintf("error getting backup volume info: %v", err)
return
} else {
var volumeInfos *volume.VolumeInfos
var volumeInfos []volume.VolumeInfo
if err := json.NewDecoder(buf).Decode(&volumeInfos); err != nil {
backupVolumes["errorReadBackupVolumeInfo"] = fmt.Sprintf("error reading backup volume info: %v", err)
return
}
for i := range volumeInfos.VolumeInfos {
switch volumeInfos.VolumeInfos[i].BackupMethod {
for i := range volumeInfos {
switch volumeInfos[i].BackupMethod {
case volume.NativeSnapshot:
nativeSnapshots = append(nativeSnapshots, &volumeInfos.VolumeInfos[i])
nativeSnapshots = append(nativeSnapshots, &volumeInfos[i])
case volume.CSISnapshot:
csiSnapshots = append(csiSnapshots, &volumeInfos.VolumeInfos[i])
csiSnapshots = append(csiSnapshots, &volumeInfos[i])
}
}
}
@@ -388,7 +388,7 @@ func describeCSISnapshotsInSF(details bool, infos []*volume.VolumeInfo, backupVo
}
if len(infos) == 0 {
backupVolumes["csiSnapshots"] = "CSI Snapshots: <none included>"
backupVolumes["csiSnapshots"] = "<none included>"
return
}
@@ -486,6 +486,7 @@ func describePodVolumeBackupsInSF(backups []velerov1api.PodVolumeBackup, details
if len(backups) > 0 {
uploaderType = backups[0].Spec.UploaderType
} else {
backupVolumes["podVolumeBackups"] = "<none included>"
return
}
// type display the type of pod volume backups

4
pkg/cmd/util/output/backup_structured_describer_test.go
View File

@@ -9,9 +9,9 @@ import (
v1 "k8s.io/api/core/v1"
"github.com/vmware-tanzu/velero/internal/volume"
"github.com/vmware-tanzu/velero/pkg/features"
"github.com/vmware-tanzu/velero/pkg/util/results"
"github.com/vmware-tanzu/velero/pkg/volume"
"github.com/stretchr/testify/assert"
@@ -238,7 +238,7 @@ func TestDescribePodVolumeBackupsInSF(t *testing.T) {
name: "empty list",
inputPVBList: []velerov1api.PodVolumeBackup{},
inputDetails: false,
expect: map[string]interface{}{},
expect: map[string]interface{}{"podVolumeBackups": "<none included>"},
},
{
name: "2 completed pvbs",