Merge pull request #249 from openshift-cherrypick-robot/cherry-pick-2…

…48-to-release-4.18 DFBUGS-1180: [release-4.18] addons: move the fetching of cephfsid only for non-provider mode
red-hat-storage · Dec 17, 2024 · f93c6bd · f93c6bd
2 parents c8dc953 + 7a796d8
commit f93c6bd
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/addons/agent_mirrorpeer_controller.go b/addons/agent_mirrorpeer_controller.go
@@ -148,17 +148,17 @@ func (r *MirrorPeerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		return ctrl.Result{}, err
 	}
 
-	clusterFSIDs := make(map[string]string)
-	logger.Info("Fetching clusterFSIDs")
-	err = r.fetchClusterFSIDs(ctx, &mirrorPeer, clusterFSIDs)
-	if err != nil {
-		if errors.IsNotFound(err) {
-			return ctrl.Result{RequeueAfter: 60 * time.Second}, nil
+	if !hasStorageClientRef {
+		clusterFSIDs := make(map[string]string)
+		logger.Info("Fetching clusterFSIDs")
+		err = r.fetchClusterFSIDs(ctx, &mirrorPeer, clusterFSIDs)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return ctrl.Result{RequeueAfter: 60 * time.Second}, nil
+			}
+			return ctrl.Result{}, fmt.Errorf("an unknown error occurred while fetching the cluster fsids, retrying again: %v", err)
 		}
-		return ctrl.Result{}, fmt.Errorf("an unknown error occurred while fetching the cluster fsids, retrying again: %v", err)
-	}
 
-	if !hasStorageClientRef {
 		logger.Info("Labeling RBD storageclasses")
 		errs := r.labelStorageClasses(ctx, scr.Namespace, clusterFSIDs)
 		if len(errs) > 0 {
@@ -168,25 +168,25 @@ func (r *MirrorPeerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		if len(errs) > 0 {
 			return ctrl.Result{}, fmt.Errorf("few failures occurred while labeling VolumeSnapshotClasses: %v", errs)
 		}
-	}
 
-	if mirrorPeer.Spec.Type == multiclusterv1alpha1.Async && !hasStorageClientRef {
-		logger.Info("Enabling async mode dependencies")
-		err = r.labelCephClusters(ctx, scr, clusterFSIDs)
-		if err != nil {
-			logger.Error("Failed to label cephcluster", "error", err)
-			return ctrl.Result{}, err
-		}
-		err = r.enableCSIAddons(ctx, scr.Namespace)
-		if err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to start CSI Addons for rook: %v", err)
-		}
+		if mirrorPeer.Spec.Type == multiclusterv1alpha1.Async {
+			logger.Info("Enabling async mode dependencies")
+			err = r.labelCephClusters(ctx, scr, clusterFSIDs)
+			if err != nil {
+				logger.Error("Failed to label cephcluster", "error", err)
+				return ctrl.Result{}, err
+			}
+			err = r.enableCSIAddons(ctx, scr.Namespace)
+			if err != nil {
+				return ctrl.Result{}, fmt.Errorf("failed to start CSI Addons for rook: %v", err)
+			}
 
-		err = r.enableMirroring(ctx, scr.Name, scr.Namespace, &mirrorPeer)
-		if err != nil {
-			return ctrl.Result{}, fmt.Errorf("failed to enable mirroring the storagecluster %q in namespace %q in managed cluster: %v", scr.Name, scr.Namespace, err)
-		}
+			err = r.enableMirroring(ctx, scr.Name, scr.Namespace, &mirrorPeer)
+			if err != nil {
+				return ctrl.Result{}, fmt.Errorf("failed to enable mirroring the storagecluster %q in namespace %q in managed cluster: %v", scr.Name, scr.Namespace, err)
+			}
 
+		}
 	}
 
 	if mirrorPeer.Spec.Type == multiclusterv1alpha1.Async && hasStorageClientRef {

diff --git a/controllers/mirrorpeer_controller.go b/controllers/mirrorpeer_controller.go
@@ -1089,7 +1089,7 @@ func (r *MirrorPeerReconciler) updateMirrorPeerStatus(ctx context.Context, mirro
 				logger.Error("Error occurred while updating the status of mirrorpeer", "error", statusErr, "MirrorPeer", mirrorPeer.Name)
 				return ctrl.Result{Requeue: true}, nil
 			}
-			return ctrl.Result{}, nil
+			return ctrl.Result{Requeue: true}, nil
 		}
 	} else {
 		// Sync mode status update, same flow as async but for s3 profile