Merge pull request metal3-io#2083 from metal3-io-bot/cherry-pick-1792…

…-to-release-0.8

🌱 Added Error message when reconciling loop is triggered more than once

controllers/metal3.io/baremetalhost_controller.go

@@ -55,6 +55,7 @@ const (
 	subResourceNotReadyRetryDelay = time.Second * 60
 	clarifySoftPoweroffFailure    = "Continuing with hard poweroff after soft poweroff fails. More details: "
 	hardwareDataFinalizer         = metal3api.BareMetalHostFinalizer + "/hardwareData"
+	NotReady                      = "Not ready"
 )
 
 // BareMetalHostReconciler reconciles a BareMetalHost object.
@@ -212,12 +213,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 = NotReady
+		} 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
 	}
 

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 = NotReady
+		} 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 = NotReady
+		} else {
+			msg = err.Error()
+		}
+		reqLogger.Info("provisioner is not ready", "Error:", msg, "RequeueAfter:", provisionerNotReadyRetryDelay)
 		return prov, ready, nil
 	}