fix: failed to keep s3 bucket retain

Author: loveRhythm1990

api/core/v1alpha1/logset_types.go

@@ -85,20 +85,29 @@ func (l *LogSetSpec) GetStoreFailureTimeout() metav1.Duration {
 }
 
 func (l *LogSetSpec) GetPVCRetentionPolicy() PVCRetentionPolicy {
-	if l.PVCRetentionPolicy == nil {
-		l.setDefaultRetentionPolicy()
+	if l.PVCRetentionPolicy != nil {
+		return *l.PVCRetentionPolicy
 	}
-	return *l.PVCRetentionPolicy
+	// inherit from s3 policy if only s3 is set (e.g. old objects without pvcRetentionPolicy)
+	if l.SharedStorage.S3 != nil && l.SharedStorage.S3.S3RetentionPolicy != nil {
+		return *l.SharedStorage.S3.S3RetentionPolicy
+	}
+	return PVCRetentionPolicyDelete
 }
 
 func (l *LogSetSpec) GetS3RetentionPolicy() *PVCRetentionPolicy {
 	if l.SharedStorage.S3 == nil {
 		return nil
 	}
-	if l.SharedStorage.S3.S3RetentionPolicy == nil {
-		l.setDefaultRetentionPolicy()
+	if l.SharedStorage.S3.S3RetentionPolicy != nil {
+		return l.SharedStorage.S3.S3RetentionPolicy
+	}
+	// inherit from pvc policy if only pvc is set (e.g. old objects without s3RetentionPolicy)
+	if l.PVCRetentionPolicy != nil {
+		return l.PVCRetentionPolicy
 	}
-	return l.SharedStorage.S3.S3RetentionPolicy
+	defaultPolicy := PVCRetentionPolicyDelete
+	return &defaultPolicy
 }
 
 type InitialConfig struct {

pkg/controllers/bucketclaim/controller.go

@@ -1,4 +1,4 @@
-// Copyright 2025 Matrix Origin
+// Copyright 2025-2026 Matrix Origin
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -71,6 +71,16 @@ func (bca *Actor) Finalize(ctx *recon.Context[*v1alpha1.BucketClaim]) (bool, err
 		return false, ctx.Update(bucket)
 	}
 
+	// if bucket is Released (s3RetentionPolicy=Retain), skip data deletion and release the finalizer directly
+	if bucket.Status.State == v1alpha1.StatusReleased {
+		ctx.Log.Info(fmt.Sprintf("skip data deletion for released bucket %v (s3RetentionPolicy=Retain)", client.ObjectKeyFromObject(ctx.Obj)))
+		controllerutil.RemoveFinalizer(bucket, v1alpha1.BucketDataFinalizer)
+		if err := ctx.Update(bucket); err != nil {
+			return false, err
+		}
+		return true, nil
+	}
+
 	// if AnnAnyInstanceRunning is not set, indicates that there is no running pod instance found for its mo cluster
 	// so there is no need to start a job to finalize bucket data.
 	// NOTE: generally LogSet start successfully is a precondition of starting DN and CN, if no running pod found means that