From 96b80a90c74f1b76e46899b96419f449e7761412 Mon Sep 17 00:00:00 2001
From: ColdsteelRail <574252631@qq.com>
Date: Fri, 7 Feb 2025 13:27:40 +0800
Subject: [PATCH] revert deleteOldPvcs

---
 pkg/controllers/collaset/pvccontrol/pvc_control.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkg/controllers/collaset/pvccontrol/pvc_control.go b/pkg/controllers/collaset/pvccontrol/pvc_control.go
index 01682fbe..bd8bb64f 100644
--- a/pkg/controllers/collaset/pvccontrol/pvc_control.go
+++ b/pkg/controllers/collaset/pvccontrol/pvc_control.go
@@ -192,7 +192,7 @@ func (pc *RealPvcControl) DeletePodUnusedPvcs(ctx context.Context, cls *appsv1al
 
 	// delete old pvc if new pvc is provisioned and WhenScaled is "Delete"
 	if collasetutils.PvcPolicyWhenScaled(cls) == appsv1alpha1.DeletePersistentVolumeClaimRetentionPolicyType {
-		return deleteOldPvcs(pc.client, ctx, cls, newPvcs, oldPvcs, mountedPvcNames)
+		return deleteOldPvcs(pc.client, ctx, cls, newPvcs, oldPvcs)
 	}
 	return nil
 }
@@ -334,13 +334,8 @@ func deleteUnclaimedPvcs(c client.Client, ctx context.Context, cls *appsv1alpha1
 	return nil
 }
 
-func deleteOldPvcs(c client.Client, ctx context.Context, cls *appsv1alpha1.CollaSet, newPvcs, oldPvcs *map[string]*corev1.PersistentVolumeClaim, mountedPvcNames sets.String) error {
+func deleteOldPvcs(c client.Client, ctx context.Context, cls *appsv1alpha1.CollaSet, newPvcs, oldPvcs *map[string]*corev1.PersistentVolumeClaim) error {
 	for pvcTmpName, pvc := range *oldPvcs {
-		// if pvc is still mounted on pod, keep it
-		if mountedPvcNames.Has(pvcTmpName) {
-			continue
-		}
-		// if new pvc is not ready, keep this pvc
 		if _, newPvcExist := (*newPvcs)[pvcTmpName]; !newPvcExist {
 			continue
 		}