Merge pull request #438 from intelligentfu8/cg-rename

smiletan · web-flow · commit 8d918263c73b · 2025-09-11T09:45:56.000+08:00
[fixed]fix fe pvc collect
diff --git a/pkg/controller/sub_controller/disaggregated_cluster/disaggregated_fe/controller.go b/pkg/controller/sub_controller/disaggregated_cluster/disaggregated_fe/controller.go
@@ -335,7 +335,7 @@ func (dfc *DisaggregatedFEController) reconcileStatefulset(ctx context.Context,
 
 // RecycleResources pvc resource for fe recycle
 func (dfc *DisaggregatedFEController) recycleResources(ctx context.Context, ddc *v1.DorisDisaggregatedCluster) error {
-	if ddc.Spec.FeSpec.PersistentVolume != nil {
+	if ddc.Spec.FeSpec.PersistentVolume != nil || len(ddc.Spec.FeSpec.PersistentVolumes) != 0{
 		return dfc.listAndDeletePersistentVolumeClaim(ctx, ddc)
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ func (dfc *DisaggregatedFEController) reconcileStatefulset(ctx context.Context,`
`335`	`335`
`336`	`336`	`// RecycleResources pvc resource for fe recycle`
`337`	`337`	`func (dfc DisaggregatedFEController) recycleResources(ctx context.Context, ddc v1.DorisDisaggregatedCluster) error {`
`338`		`- if ddc.Spec.FeSpec.PersistentVolume != nil {`
	`338`	`+ if ddc.Spec.FeSpec.PersistentVolume != nil \|\| len(ddc.Spec.FeSpec.PersistentVolumes) != 0{`
`339`	`339`	`return dfc.listAndDeletePersistentVolumeClaim(ctx, ddc)`
`340`	`340`	`}`
`341`	`341`	`return nil`