From c6eb3a33c6b7f58684d0f846794bc3d052af1b71 Mon Sep 17 00:00:00 2001 From: travisn Date: Wed, 17 May 2023 15:47:17 -0600 Subject: [PATCH] rbdmirror: retry reconcile if cluster not initialized The rbd mirror reconcile was not re-queuing the reconcile if the cephcluster was not initialized. All other controllers waiting for the initialization are requeuing the event, just not the rbd mirror controller. Signed-off-by: travisn (cherry picked from commit 28775231374ec64216e16275d3f067f4bd3a3634) --- pkg/operator/ceph/cluster/rbd/controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/operator/ceph/cluster/rbd/controller.go b/pkg/operator/ceph/cluster/rbd/controller.go index 077449cb9..2e75b793f 100644 --- a/pkg/operator/ceph/cluster/rbd/controller.go +++ b/pkg/operator/ceph/cluster/rbd/controller.go @@ -206,7 +206,7 @@ func (r *ReconcileCephRBDMirror) reconcile(request reconcile.Request) (reconcile if err != nil { if strings.Contains(err.Error(), opcontroller.UninitializedCephConfigError) { logger.Info(opcontroller.OperatorNotInitializedMessage) - return reconcile.Result{}, *cephRBDMirror, nil + return opcontroller.WaitForRequeueIfOperatorNotInitialized, *cephRBDMirror, nil } return reconcile.Result{}, *cephRBDMirror, errors.Wrap(err, "failed to detect running and desired ceph version") }