From 0b9ac17789adf055a64b105822b89d6565ab62d2 Mon Sep 17 00:00:00 2001
From: wangyelei <yelei.wang@apecloud.com>
Date: Fri, 13 Oct 2023 11:00:26 +0800
Subject: [PATCH 1/2] bugfix: hscale out failed for Failed to set default
 snapshot class

---
 .../dataprotection/action/action_create_vs.go | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/internal/dataprotection/action/action_create_vs.go b/internal/dataprotection/action/action_create_vs.go
index b8ed5ab7c78..28d4c36c1a3 100644
--- a/internal/dataprotection/action/action_create_vs.go
+++ b/internal/dataprotection/action/action_create_vs.go
@@ -20,12 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package action
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
 	vsv1 "github.com/kubernetes-csi/external-snapshotter/client/v6/apis/volumesnapshot/v1"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
+	storagev1 "k8s.io/api/storage/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
@@ -139,8 +141,8 @@ func (c *CreateVolumeSnapshotAction) createVolumeSnapshotIfNotExist(ctx Context,
 	pvc *corev1.PersistentVolumeClaim,
 	key client.ObjectKey) error {
 	var (
-		err error
-		vsc *vsv1.VolumeSnapshotClass
+		err     error
+		vscName string
 	)
 
 	snap := &vsv1.VolumeSnapshot{}
@@ -167,8 +169,12 @@ func (c *CreateVolumeSnapshotAction) createVolumeSnapshotIfNotExist(ctx Context,
 		},
 	}
 
-	if vsc != nil {
-		snap.Spec.VolumeSnapshotClassName = &vsc.Name
+	if pvc.Spec.StorageClassName != nil && *pvc.Spec.StorageClassName != "" {
+		vscName, err = c.getVolumeSnapshotClassName(ctx.Ctx, ctx.Client, vsCli, *pvc.Spec.StorageClassName)
+	}
+
+	if vscName != "" {
+		snap.Spec.VolumeSnapshotClassName = &vscName
 	}
 
 	controllerutil.AddFinalizer(snap, dptypes.DataProtectionFinalizerName)
@@ -184,6 +190,29 @@ func (c *CreateVolumeSnapshotAction) createVolumeSnapshotIfNotExist(ctx Context,
 	return nil
 }
 
+func (c *CreateVolumeSnapshotAction) getVolumeSnapshotClassName(
+	ctx context.Context,
+	cli client.Client,
+	vsCli intctrlutil.VolumeSnapshotCompatClient,
+	scName string) (string, error) {
+	scObj := storagev1.StorageClass{}
+	// ignore if not found storage class, use the default volume snapshot class
+	if err := cli.Get(ctx, client.ObjectKey{Name: scName}, &scObj); client.IgnoreNotFound(err) != nil {
+		return "", err
+	}
+
+	vscList := vsv1.VolumeSnapshotClassList{}
+	if err := vsCli.List(&vscList); err != nil {
+		return "", err
+	}
+	for _, item := range vscList.Items {
+		if item.Driver == scObj.Provisioner {
+			return item.Name, nil
+		}
+	}
+	return "", nil
+}
+
 func ensureVolumeSnapshotReady(
 	vsCli intctrlutil.VolumeSnapshotCompatClient,
 	key client.ObjectKey) (bool, *vsv1.VolumeSnapshot, error) {

From 0806bcbfcc2e2e26b28f7643b1067e523cb83997 Mon Sep 17 00:00:00 2001
From: wangyelei <yelei.wang@apecloud.com>
Date: Fri, 13 Oct 2023 11:10:14 +0800
Subject: [PATCH 2/2] check error

---
 internal/dataprotection/action/action_create_vs.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/internal/dataprotection/action/action_create_vs.go b/internal/dataprotection/action/action_create_vs.go
index 28d4c36c1a3..1d3fc340f8c 100644
--- a/internal/dataprotection/action/action_create_vs.go
+++ b/internal/dataprotection/action/action_create_vs.go
@@ -170,7 +170,9 @@ func (c *CreateVolumeSnapshotAction) createVolumeSnapshotIfNotExist(ctx Context,
 	}
 
 	if pvc.Spec.StorageClassName != nil && *pvc.Spec.StorageClassName != "" {
-		vscName, err = c.getVolumeSnapshotClassName(ctx.Ctx, ctx.Client, vsCli, *pvc.Spec.StorageClassName)
+		if vscName, err = c.getVolumeSnapshotClassName(ctx.Ctx, ctx.Client, vsCli, *pvc.Spec.StorageClassName); err != nil {
+			return err
+		}
 	}
 
 	if vscName != "" {