Set clone strategy for ceph to CSI clone (#2817)

Per recommendation from ceph CSI team, switching over to doing CSI clones by default for ceph provisioners. Implementation is very similar to today's smart cloning via temporary snapshot. Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com> Co-authored-by: Alex Kalenyuk <akalenyu@redhat.com>
kubevirt · Jul 26, 2023 · 1d729fd · 1d729fd
1 parent f46544c
commit 1d729fd
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 11 deletions.
diff --git a/pkg/storagecapabilities/storagecapabilities.go b/pkg/storagecapabilities/storagecapabilities.go
@@ -113,13 +113,17 @@ var SourceFormatsByProvisionerKey = map[string]cdiv1.DataImportCronSourceFormat{
 
 // CloneStrategyByProvisionerKey defines the advised clone strategy for a provisioner
 var CloneStrategyByProvisionerKey = map[string]cdiv1.CDICloneStrategy{
-	"csi-vxflexos.dellemc.com":   cdiv1.CloneStrategyCsiClone,
-	"csi-isilon.dellemc.com":     cdiv1.CloneStrategyCsiClone,
-	"csi-powermax.dellemc.com":   cdiv1.CloneStrategyCsiClone,
-	"csi-powerstore.dellemc.com": cdiv1.CloneStrategyCsiClone,
-	"hspc.csi.hitachi.com":       cdiv1.CloneStrategyCsiClone,
-	"csi.hpe.com":                cdiv1.CloneStrategyCsiClone,
-	"spectrumscale.csi.ibm.com":  cdiv1.CloneStrategyCsiClone,
+	"csi-vxflexos.dellemc.com":              cdiv1.CloneStrategyCsiClone,
+	"csi-isilon.dellemc.com":                cdiv1.CloneStrategyCsiClone,
+	"csi-powermax.dellemc.com":              cdiv1.CloneStrategyCsiClone,
+	"csi-powerstore.dellemc.com":            cdiv1.CloneStrategyCsiClone,
+	"hspc.csi.hitachi.com":                  cdiv1.CloneStrategyCsiClone,
+	"csi.hpe.com":                           cdiv1.CloneStrategyCsiClone,
+	"spectrumscale.csi.ibm.com":             cdiv1.CloneStrategyCsiClone,
+	"rook-ceph.rbd.csi.ceph.com":            cdiv1.CloneStrategyCsiClone,
+	"openshift-storage.rbd.csi.ceph.com":    cdiv1.CloneStrategyCsiClone,
+	"cephfs.csi.ceph.com":                   cdiv1.CloneStrategyCsiClone,
+	"openshift-storage.cephfs.csi.ceph.com": cdiv1.CloneStrategyCsiClone,
 }
 
 // ProvisionerNoobaa is the provisioner string for the Noobaa object bucket provisioner which does not work with CDI

diff --git a/tests/cloner_test.go b/tests/cloner_test.go
@@ -1122,6 +1122,11 @@ var _ = Describe("all clone tests", func() {
 
 				By(fmt.Sprintf("Got original storage profile: %v", spec))
 				originalProfileSpec = spec
+
+				By(fmt.Sprintf("configure storage profile %s", cloneStorageClassName))
+				Expect(
+					utils.ConfigureCloneStrategy(f.CrClient, f.CdiClient, cloneStorageClassName, originalProfileSpec, cdiv1.CloneStrategySnapshot),
+				).Should(Succeed())
 			})
 			AfterEach(func() {
 				By("[AfterEach] Restore the profile")
@@ -3162,13 +3167,13 @@ func validateCloneType(f *framework.Framework, dv *cdiv1.DataVolume) {
 		isCrossNamespaceClone := sourcePVC.Namespace != targetPVC.Namespace
 
 		if sourcePVC.Spec.StorageClassName != nil {
-			spec, err := utils.GetStorageProfileSpec(f.CdiClient, *sourcePVC.Spec.StorageClassName)
-			Expect(err).NotTo(HaveOccurred())
+			storageProfile, err := f.CdiClient.CdiV1beta1().StorageProfiles().Get(context.TODO(), *sourcePVC.Spec.StorageClassName, metav1.GetOptions{})
+			Expect(err).ToNot(HaveOccurred())
 
 			defaultCloneStrategy := cdiv1.CloneStrategySnapshot
 			cloneStrategy := &defaultCloneStrategy
-			if spec.CloneStrategy != nil {
-				cloneStrategy = spec.CloneStrategy
+			if strategy := storageProfile.Status.CloneStrategy; strategy != nil {
+				cloneStrategy = strategy
 			}
 
 			sc, err := f.K8sClient.StorageV1().StorageClasses().Get(context.TODO(), f.SnapshotSCName, metav1.GetOptions{})

diff --git a/tests/smartclone_test.go b/tests/smartclone_test.go
@@ -77,8 +77,37 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]SmartClone tests th
 })
 
 var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]SmartClone tests", func() {
+	var originalProfileSpec *cdiv1.StorageProfileSpec
+	var cloneStorageClassName string
+
 	f := framework.NewFramework("dv-func-test")
 
+	BeforeEach(func() {
+		cloneStorageClassName = utils.DefaultStorageClass.GetName()
+		if f.IsCSIVolumeCloneStorageClassAvailable() {
+			cloneStorageClassName = f.CsiCloneSCName
+		}
+
+		By(fmt.Sprintf("Get original storage profile: %s", cloneStorageClassName))
+
+		spec, err := utils.GetStorageProfileSpec(f.CdiClient, cloneStorageClassName)
+		originalProfileSpec = spec
+		Expect(err).ToNot(HaveOccurred())
+		By(fmt.Sprintf("Got original storage profile: %v", originalProfileSpec))
+
+		By(fmt.Sprintf("configure storage profile %s", cloneStorageClassName))
+		Expect(
+			utils.ConfigureCloneStrategy(f.CrClient, f.CdiClient, cloneStorageClassName, originalProfileSpec, cdiv1.CloneStrategySnapshot),
+		).Should(Succeed())
+	})
+
+	AfterEach(func() {
+		if originalProfileSpec != nil {
+			By("Restore the profile")
+			Expect(utils.UpdateStorageProfile(f.CrClient, cloneStorageClassName, *originalProfileSpec)).To(Succeed())
+		}
+	})
+
 	It("[rfe_id:1106][test_id:3494][crit:high][vendor:cnv-qe@redhat.com][level:component] Verify DataVolume Smart Cloning - volumeMode filesystem - Positive flow", func() {
 		if !f.IsSnapshotStorageClassAvailable() {
 			Skip("Smart Clone is not applicable")