Merge pull request #7138 from blackpiglet/6595_volumeinfo_restore

Use VolumeInfo to help restore the PV.

pkg/backup/backup_test.go

@@ -71,8 +71,8 @@ func TestBackedUpItemsMatchesTarballContents(t *testing.T) {
 	req := &Request{
 		Backup:           defaultBackup().Result(),
 		SkippedPVTracker: NewSkipPVTracker(),
-		PVMap:            map[string]PvcPvInfo{},
 	}
+
 	backupFile := bytes.NewBuffer([]byte{})
 
 	apiResources := []*test.APIResource{

pkg/backup/item_backupper.go

@@ -699,28 +699,15 @@ func (ib *itemBackupper) addVolumeInfo(obj runtime.Unstructured, log logrus.Fiel
 		return err
 	}
 
-	if ib.backupRequest.PVMap == nil {
-		ib.backupRequest.PVMap = make(map[string]PvcPvInfo)
-	}
-
 	pvcName := ""
 	pvcNamespace := ""
 	if pv.Spec.ClaimRef != nil {
 		pvcName = pv.Spec.ClaimRef.Name
 		pvcNamespace = pv.Spec.ClaimRef.Namespace
-
-		ib.backupRequest.PVMap[pvcNamespace+"/"+pvcName] = PvcPvInfo{
-			PVCName:      pvcName,
-			PVCNamespace: pvcNamespace,
-			PV:           *pv,
-		}
 	}
 
-	ib.backupRequest.PVMap[pv.Name] = PvcPvInfo{
-		PVCName:      pvcName,
-		PVCNamespace: pvcNamespace,
-		PV:           *pv,
-	}
+	ib.backupRequest.VolumesInformation.InsertPVMap(*pv, pvcName, pvcNamespace)
+
 	return nil
 }
 

pkg/backup/item_backupper_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	"github.com/vmware-tanzu/velero/pkg/kuberesource"
-	"github.com/vmware-tanzu/velero/pkg/volume"
 
 	"github.com/stretchr/testify/assert"
 	corev1api "k8s.io/api/core/v1"
@@ -242,36 +241,16 @@ func TestRandom(t *testing.T) {
 
 func TestAddVolumeInfo(t *testing.T) {
 	tests := []struct {
-		name               string
-		pv                 *corev1api.PersistentVolume
-		expectedVolumeInfo map[string]PvcPvInfo
+		name string
+		pv   *corev1api.PersistentVolume
 	}{
 		{
 			name: "PV has ClaimRef",
 			pv:   builder.ForPersistentVolume("testPV").ClaimRef("testNS", "testPVC").Result(),
-			expectedVolumeInfo: map[string]PvcPvInfo{
-				"testPV": {
-					PVCName:      "testPVC",
-					PVCNamespace: "testNS",
-					PV:           *builder.ForPersistentVolume("testPV").ClaimRef("testNS", "testPVC").Result(),
-				},
-				"testNS/testPVC": {
-					PVCName:      "testPVC",
-					PVCNamespace: "testNS",
-					PV:           *builder.ForPersistentVolume("testPV").ClaimRef("testNS", "testPVC").Result(),
-				},
-			},
 		},
 		{
 			name: "PV has no ClaimRef",
 			pv:   builder.ForPersistentVolume("testPV").Result(),
-			expectedVolumeInfo: map[string]PvcPvInfo{
-				"testPV": {
-					PVCName:      "",
-					PVCNamespace: "",
-					PV:           *builder.ForPersistentVolume("testPV").Result(),
-				},
-			},
 		},
 	}
 
@@ -279,7 +258,7 @@ func TestAddVolumeInfo(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			ib := itemBackupper{}
 			ib.backupRequest = new(Request)
-			ib.backupRequest.VolumeInfos.VolumeInfos = make([]volume.VolumeInfo, 0)
+			ib.backupRequest.VolumesInformation.Init()
 
 			pvObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(tc.pv)
 			require.NoError(t, err)
@@ -287,7 +266,6 @@ func TestAddVolumeInfo(t *testing.T) {
 
 			err = ib.addVolumeInfo(&unstructured.Unstructured{Object: pvObj}, logger)
 			require.NoError(t, err)
-			require.Equal(t, tc.expectedVolumeInfo, ib.backupRequest.PVMap)
 		})
 	}
 }

pkg/backup/request.go

@@ -20,10 +20,9 @@ import (
 	"fmt"
 	"sort"
 
-	corev1api "k8s.io/api/core/v1"
-
 	"github.com/vmware-tanzu/velero/internal/hook"
 	"github.com/vmware-tanzu/velero/internal/resourcepolicies"
+	internalVolume "github.com/vmware-tanzu/velero/internal/volume"
 	velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	"github.com/vmware-tanzu/velero/pkg/itemoperation"
 	"github.com/vmware-tanzu/velero/pkg/plugin/framework"
@@ -54,17 +53,11 @@ type Request struct {
 	itemOperationsList        *[]*itemoperation.BackupOperation
 	ResPolicies               *resourcepolicies.Policies
 	SkippedPVTracker          *skipPVTracker
-	// A map contains the backup-included PV detail content.
-	// The key is PV name or PVC name(The format is PVC-namespace/PVC-name)
-	PVMap       map[string]PvcPvInfo
-	VolumeInfos volume.VolumeInfos
+	VolumesInformation        internalVolume.VolumesInformation
 }
 
-type PvcPvInfo struct {
-	PVCName      string
-	PVCNamespace string
-	PV           corev1api.PersistentVolume
-}
+// VolumesInformation contains the information needs by generating
+// the backup VolumeInfo array.
 
 // GetItemOperationsList returns ItemOperationsList, initializing it if necessary
 func (r *Request) GetItemOperationsList() *[]*itemoperation.BackupOperation {
@@ -94,3 +87,17 @@ func (r *Request) BackupResourceList() map[string][]string {
 
 	return resources
 }
+
+func (r *Request) FillVolumesInformation() {
+	skippedPVMap := make(map[string]string)
+
+	for _, skippedPV := range r.SkippedPVTracker.Summary() {
+		skippedPVMap[skippedPV.Name] = skippedPV.SerializeSkipReasons()
+	}
+
+	r.VolumesInformation.SkippedPVs = skippedPVMap
+	r.VolumesInformation.NativeSnapshots = r.VolumeSnapshots
+	r.VolumesInformation.PodVolumeBackups = r.PodVolumeBackups
+	r.VolumesInformation.BackupOperations = *r.GetItemOperationsList()
+	r.VolumesInformation.BackupName = r.Backup.Name
+}

pkg/backup/request_test.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2019 the Velero contributors.
+Copyright the Velero contributors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

pkg/backup/snapshots.go

@@ -1,3 +1,19 @@
+/*
+Copyright The Velero Contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package backup
 
 import (