Skip to content

Commit

Permalink
Merge pull request #2299 from malayparida2000/rbd_mirror_debug_job
Browse files Browse the repository at this point in the history
Skip ensureRbdMirrorDebugLogging job in case of external storage cluster
  • Loading branch information
openshift-merge-bot[bot] authored Dec 6, 2023
2 parents dc0f050 + 33492a2 commit df7a769
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions controllers/storagecluster/reconcile.go
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,12 @@ func (r *StorageClusterReconciler) reconcilePhases(

// Ensure that verbose logging is enabled when RBD mirroring is enabled
// TODO: This is a temporary arrangement, this is to be removed when RDR goes to GA
result, err := r.ensureRbdMirrorDebugLogging(instance)
if !result.IsZero() || err != nil {
r.Log.Error(err, "Failed to ensure RBD mirror debug logging.")
return result, err
if !instance.Spec.ExternalStorage.Enable {
result, err := r.ensureRbdMirrorDebugLogging(instance)
if !result.IsZero() || err != nil {
r.Log.Error(err, "Failed to ensure RBD mirror debug logging.")
return result, err
}
}

return reconcile.Result{}, nil
Expand Down

0 comments on commit df7a769

Please sign in to comment.