Skip to content

[Fixed]fix annotation leave #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

[Fixed]fix annotation leave #404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions pkg/controller/disaggregated_cluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package controller
import (
"context"
"errors"
"fmt"
dv1 "github.com/apache/doris-operator/api/disaggregated/v1"
"github.com/apache/doris-operator/pkg/common/utils/hash"
sc "github.com/apache/doris-operator/pkg/controller/sub_controller"
Expand Down Expand Up @@ -306,6 +307,8 @@ func (dc *DisaggregatedClusterReconciler) reconcileSub(ctx context.Context, ddc
// when spec revert by operator should update cr or directly update status.
func (dc *DisaggregatedClusterReconciler) updateObjectORStatus(ctx context.Context, ddc *dv1.DorisDisaggregatedCluster, preHv string) (ctrl.Result, error) {
postHv := hash.HashObject(ddc.Spec)
//clear reconcile used message
dc.clearReconcileAnnotations(ddc)
deepCopyDDC := ddc.DeepCopy()
if preHv != postHv {
var eddc dv1.DorisDisaggregatedCluster
Expand Down Expand Up @@ -341,6 +344,23 @@ func (dc *DisaggregatedClusterReconciler) updateObjectORStatus(ctx context.Conte

}

func(dc *DisaggregatedClusterReconciler) clearReconcileAnnotations(ddc *dv1.DorisDisaggregatedCluster) {
if len(ddc.Annotations) == 0 {
return
}

var delAnnos []string
delAnnos = append(delAnnos, fmt.Sprintf(dv1.UpdateStatefulsetName, ddc.GetFEStatefulsetName()))
delAnnos = append(delAnnos, fmt.Sprintf(dv1.UpdateStatefulsetName, ddc.GetMSStatefulsetName()))
for _, cg := range ddc.Spec.ComputeGroups {
delAnnos = append(delAnnos, fmt.Sprintf(dv1.UpdateStatefulsetName, ddc.GetCGStatefulsetName(&cg)))
}

for _, delAnno := range delAnnos {
delete(ddc.Annotations, delAnno)
}
}

func (dc *DisaggregatedClusterReconciler) updateDorisDisaggregatedClusterStatus(ctx context.Context, ddc *dv1.DorisDisaggregatedCluster) (ctrl.Result, error) {
var eddc dv1.DorisDisaggregatedCluster
if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
Expand Down