Skip to content

Commit a621a6a

Browse files
committed
fix #648: delete the statefulset with precondition set to the correct UID
1 parent 0baa212 commit a621a6a

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

controllers/reconcile_finalizer.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ func (r *RabbitmqClusterReconciler) removeFinalizer(ctx context.Context, rabbitm
4141
func (r *RabbitmqClusterReconciler) prepareForDeletion(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error {
4242
if controllerutil.ContainsFinalizer(rabbitmqCluster, deletionFinalizer) {
4343
if err := clientretry.RetryOnConflict(clientretry.DefaultRetry, func() error {
44+
uid, err := r.statefulSetUID(ctx, rabbitmqCluster);
45+
if err != nil {
46+
return err
47+
}
4448
sts := &appsv1.StatefulSet{
4549
ObjectMeta: metav1.ObjectMeta{
4650
Name: rabbitmqCluster.ChildResourceName("server"),
@@ -54,7 +58,7 @@ func (r *RabbitmqClusterReconciler) prepareForDeletion(ctx context.Context, rabb
5458
// Delete StatefulSet immediately after changing pod labels to minimize risk of them respawning.
5559
// There is a window where the StatefulSet could respawn Pods without the deletion label in this order.
5660
// But we can't delete it before because the DownwardAPI doesn't update once a Pod enters Terminating.
57-
if err := r.Client.Delete(ctx, sts); client.IgnoreNotFound(err) != nil {
61+
if err := r.Client.Delete(ctx, sts, &client.DeleteOptions{Preconditions: &metav1.Preconditions{UID: &uid}}); client.IgnoreNotFound(err) != nil {
5862
return fmt.Errorf("cannot delete StatefulSet: %s", err.Error())
5963
}
6064

controllers/utils.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@ package controllers
22

33
import (
44
"context"
5+
"fmt"
6+
57
rabbitmqv1beta1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
68
appsv1 "k8s.io/api/apps/v1"
79
corev1 "k8s.io/api/core/v1"
10+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
811
"k8s.io/apimachinery/pkg/api/errors"
912
"k8s.io/apimachinery/pkg/api/meta"
1013
"k8s.io/apimachinery/pkg/types"
@@ -64,6 +67,18 @@ func (r *RabbitmqClusterReconciler) statefulSet(ctx context.Context, rmq *rabbit
6467
return sts, nil
6568
}
6669

70+
func (r *RabbitmqClusterReconciler) statefulSetUID(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster) (types.UID, error) {
71+
uid := types.UID("")
72+
if sts, err := r.statefulSet(ctx, rmq); err == nil {
73+
if ref := metav1.GetControllerOf(sts); ref != nil {
74+
if string(rmq.GetUID()) == string(ref.UID) {
75+
return sts.UID, nil
76+
}
77+
}
78+
}
79+
return uid, fmt.Errorf("failed to get the uid of the statefulset owned by the current rabbitmqCluster")
80+
}
81+
6782
func (r *RabbitmqClusterReconciler) configMap(ctx context.Context, rmq *rabbitmqv1beta1.RabbitmqCluster, name string) (*corev1.ConfigMap, error) {
6883
configMap := &corev1.ConfigMap{}
6984
if err := r.Get(ctx, types.NamespacedName{Namespace: rmq.Namespace, Name: name}, configMap); err != nil {

0 commit comments

Comments
 (0)