Skip to content

Commit

Permalink
Merge pull request #2203 from sp98/revert-2190
Browse files Browse the repository at this point in the history
Bug 2234735:[release-4.14] Revert "support osd migration in RDR customers
  • Loading branch information
openshift-ci[bot] authored Oct 5, 2023
2 parents d290a42 + 453b736 commit 81f7b7a
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions controllers/storagecluster/cephcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,12 +269,6 @@ func (obj *ocsCephCluster) ensureCreated(r *StorageClusterReconciler, sc *ocsv1.
// Prevent removal of any RDR optimizations if they are already applied to the existing cluster spec.
cephCluster.Spec.Storage.Store = determineOSDStore(cephCluster.Spec.Storage.Store, found.Spec.Storage.Store)

// Use bluestore-rdr if mirrioring is enabled
if sc.Spec.Mirroring.Enabled && !sc.Spec.ExternalStorage.Enable {
cephCluster.Spec.Storage.Store.Type = string(rookCephv1.StoreTypeBlueStoreRDR)
cephCluster.Spec.Storage.Store.UpdateStore = "yes-really-update-store"
}

// Add it to the list of RelatedObjects if found
objectRef, err := reference.GetReference(r.Scheme, found)
if err != nil {
Expand Down

0 comments on commit 81f7b7a

Please sign in to comment.