Added Error message when reconciling loop is triggered more than once

Signed-off-by: “babugeet <abhinandhbg@gmail.com>”
metal3-io · Jun 20, 2024 · 877d9f7 · 877d9f7
1 parent 7767a23
commit 877d9f7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/controllers/metal3.io/baremetalhost_controller.go b/controllers/metal3.io/baremetalhost_controller.go
@@ -212,12 +212,15 @@ func (r *BareMetalHostReconciler) Reconcile(ctx context.Context, request ctrl.Re
 	}
 
 	ready, err := prov.TryInit()
-	if err != nil {
-		return ctrl.Result{}, errors.Wrap(err, "failed to check services availability")
-	}
-	if !ready {
+	if err != nil || !ready {
+		var msg string
+		if err == nil {
+			msg = "Not ready"
+		} else {
+			msg = err.Error()
+		}
 		provisionerNotReady.Inc()
-		reqLogger.Info("provisioner is not ready", "RequeueAfter:", provisionerNotReadyRetryDelay)
+		reqLogger.Info("provisioner is not ready", "Error", msg, "RequeueAfter:", provisionerNotReadyRetryDelay)
 		return ctrl.Result{Requeue: true, RequeueAfter: provisionerNotReadyRetryDelay}, nil
 	}
 

diff --git a/controllers/metal3.io/bmceventsubscription_controller.go b/controllers/metal3.io/bmceventsubscription_controller.go
@@ -100,12 +100,14 @@ func (r *BMCEventSubscriptionReconciler) Reconcile(ctx context.Context, request
 
 	prov, ready, err := r.getProvisioner(ctx, request, host)
 
-	if err != nil {
-		return ctrl.Result{}, errors.Wrap(err, "failed to create provisioner")
-	}
-
-	if !ready {
-		reqLogger.Info("provisioner is not ready", "RequeueAfter:", provisionerNotReadyRetryDelay)
+	if err != nil || !ready {
+		var msg string
+		if err == nil {
+			msg = "Not ready"
+		} else {
+			msg = err.Error()
+		}
+		reqLogger.Info("provisioner is not ready", "Error", msg, "RequeueAfter:", provisionerNotReadyRetryDelay)
 		return ctrl.Result{RequeueAfter: provisionerNotReadyRetryDelay}, nil
 	}
 
@@ -220,12 +222,14 @@ func (r *BMCEventSubscriptionReconciler) getProvisioner(ctx context.Context, req
 	}
 
 	ready, err = prov.TryInit()
-	if err != nil {
-		return prov, ready, errors.Wrap(err, "failed to check services availability")
-	}
-
-	if !ready {
-		reqLogger.Info("provisioner is not ready", "RequeueAfter:", provisionerNotReadyRetryDelay)
+	if err != nil || !ready {
+		var msg string
+		if err == nil {
+			msg = "Not ready"
+		} else {
+			msg = err.Error()
+		}
+		reqLogger.Info("provisioner is not ready", "Error", msg, "RequeueAfter:", provisionerNotReadyRetryDelay)
 		return prov, ready, nil
 	}