diff --git a/pkg/operator/ceph/disruption/clusterdisruption/osd.go b/pkg/operator/ceph/disruption/clusterdisruption/osd.go index 8591a6838..2b5e105fc 100644 --- a/pkg/operator/ceph/disruption/clusterdisruption/osd.go +++ b/pkg/operator/ceph/disruption/clusterdisruption/osd.go @@ -178,7 +178,7 @@ func (r *ReconcileClusterDisruption) reconcilePDBsForOSDs( if clean { pdbStateMap.Data[disabledPDBKey] = drainingFailureDomains[0] } - } else { + } else if clean { pdbStateMap.Data[disabledPDBKey] = "" } diff --git a/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go b/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go index eba69f3a4..ede02b009 100644 --- a/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go +++ b/pkg/operator/ceph/disruption/clusterdisruption/reconcile.go @@ -183,8 +183,8 @@ func (r *ReconcileClusterDisruption) reconcile(request reconcile.Request) (recon if err != nil { return reconcile.Result{}, err } - _, ok := pdbStateMap.Data[disabledPDBKey] - if ok { + disabledPDB, ok := pdbStateMap.Data[disabledPDBKey] + if ok && len(disabledPDB) > 0 { return reconcile.Result{Requeue: true, RequeueAfter: 30 * time.Second}, nil } return reconcile.Result{}, nil