Merge pull request #2795 from rewantsoni/blockpools

update the cephblockpool reonciler to disable mirroring
red-hat-storage · Sep 13, 2024 · 6cbff2c · 6cbff2c
2 parents b82b171 + bdbcb58
commit 6cbff2c
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 22 deletions.
diff --git a/api/v1/storagecluster_types.go b/api/v1/storagecluster_types.go
@@ -86,7 +86,7 @@ type StorageClusterSpec struct {
 	Arbiter ArbiterSpec `json:"arbiter,omitempty"`
 	// Mirroring specifies data mirroring configuration for the storage cluster.
 	// This configuration will only be applied to resources managed by the operator.
-	Mirroring MirroringSpec `json:"mirroring,omitempty"`
+	Mirroring *MirroringSpec `json:"mirroring,omitempty"`
 	// OverprovisionControl specifies the allowed hard-limit PVs overprovisioning relative to
 	// the effective usable storage capacity.
 	OverprovisionControl []OverprovisionControlSpec `json:"overprovisionControl,omitempty"`

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/controllers/storagecluster/cephblockpools.go b/controllers/storagecluster/cephblockpools.go
@@ -93,10 +93,14 @@ func (o *ocsCephBlockPools) reconcileCephBlockPool(r *StorageClusterReconciler,
 		cephBlockPool.Spec.PoolSpec.Replicated = generateCephReplicatedSpec(storageCluster, "data")
 		cephBlockPool.Spec.PoolSpec.EnableRBDStats = true
 
-		if storageCluster.Spec.Mirroring.Enabled {
-			cephBlockPool.Spec.PoolSpec.Mirroring.Enabled = true
-			cephBlockPool.Spec.PoolSpec.Mirroring.Mode = "image"
-			cephBlockPool.Spec.PoolSpec.Mirroring.Peers = o.addPeerSecretsToCephBlockPool(r, storageCluster, cephBlockPool.Name, cephBlockPool.Namespace)
+		if storageCluster.Spec.Mirroring != nil {
+			if storageCluster.Spec.Mirroring.Enabled {
+				cephBlockPool.Spec.PoolSpec.Mirroring.Enabled = true
+				cephBlockPool.Spec.PoolSpec.Mirroring.Mode = "image"
+				cephBlockPool.Spec.PoolSpec.Mirroring.Peers = o.addPeerSecretsToCephBlockPool(r, storageCluster, cephBlockPool.Name, cephBlockPool.Namespace)
+			} else {
+				cephBlockPool.Spec.PoolSpec.Mirroring = cephv1.MirroringSpec{Enabled: false}
+			}
 		}
 		return controllerutil.SetControllerReference(storageCluster, cephBlockPool, r.Scheme)
 	})
@@ -249,10 +253,14 @@ func (o *ocsCephBlockPools) reconcileNonResilientCephBlockPool(r *StorageCluster
 			}
 			cephBlockPool.Spec.PoolSpec.EnableRBDStats = true
 
-			if storageCluster.Spec.Mirroring.Enabled {
-				cephBlockPool.Spec.PoolSpec.Mirroring.Enabled = true
-				cephBlockPool.Spec.PoolSpec.Mirroring.Mode = "image"
-				cephBlockPool.Spec.PoolSpec.Mirroring.Peers = o.addPeerSecretsToCephBlockPool(r, storageCluster, cephBlockPool.Name, cephBlockPool.Namespace)
+			if storageCluster.Spec.Mirroring != nil {
+				if storageCluster.Spec.Mirroring.Enabled {
+					cephBlockPool.Spec.PoolSpec.Mirroring.Enabled = true
+					cephBlockPool.Spec.PoolSpec.Mirroring.Mode = "image"
+					cephBlockPool.Spec.PoolSpec.Mirroring.Peers = o.addPeerSecretsToCephBlockPool(r, storageCluster, cephBlockPool.Name, cephBlockPool.Namespace)
+				} else {
+					cephBlockPool.Spec.PoolSpec.Mirroring = cephv1.MirroringSpec{Enabled: false}
+				}
 			}
 			return controllerutil.SetControllerReference(storageCluster, cephBlockPool, r.Scheme)
 		})

diff --git a/controllers/storagecluster/cephblockpools_test.go b/controllers/storagecluster/cephblockpools_test.go
@@ -55,7 +55,7 @@ func TestInjectingPeerTokenToCephBlockPool(t *testing.T) {
 			label:                "test-injecting-peer-token-to-cephblockpool",
 			createRuntimeObjects: false,
 			spec: &api.StorageClusterSpec{
-				Mirroring: api.MirroringSpec{
+				Mirroring: &api.MirroringSpec{
 					Enabled:         true,
 					PeerSecretNames: []string{testPeerSecretName},
 				},
@@ -65,7 +65,7 @@ func TestInjectingPeerTokenToCephBlockPool(t *testing.T) {
 			label:                "test-injecting-empty-peer-token-to-cephblockpool",
 			createRuntimeObjects: false,
 			spec: &api.StorageClusterSpec{
-				Mirroring: api.MirroringSpec{
+				Mirroring: &api.MirroringSpec{
 					Enabled:         true,
 					PeerSecretNames: []string{},
 				},
@@ -75,7 +75,7 @@ func TestInjectingPeerTokenToCephBlockPool(t *testing.T) {
 			label:                "test-injecting-invalid-peer-token-cephblockpool",
 			createRuntimeObjects: false,
 			spec: &api.StorageClusterSpec{
-				Mirroring: api.MirroringSpec{
+				Mirroring: &api.MirroringSpec{
 					Enabled:         true,
 					PeerSecretNames: []string{"wrong-secret-name"},
 				},

diff --git a/controllers/storagecluster/cephrbdmirrors.go b/controllers/storagecluster/cephrbdmirrors.go
@@ -92,7 +92,7 @@ func (obj *ocsCephRbdMirrors) ensureCreated(r *StorageClusterReconciler, instanc
 		return reconcile.Result{}, err
 	}
 
-	if !instance.Spec.Mirroring.Enabled {
+	if instance.Spec.Mirroring == nil || !instance.Spec.Mirroring.Enabled {
 		return reconcile.Result{}, r.deleteCephRbdMirrorInstance(cephRbdMirrors)
 	}
 
@@ -168,7 +168,7 @@ ceph config rm mgr mgr/rbd_support/log_level
 		echo "completed"`
 
 	// Mirroring is enabled but the debug logging is disabled
-	if sc.Spec.Mirroring.Enabled && !rbdMirrorDebugLoggingEnabled {
+	if sc.Spec.Mirroring != nil && sc.Spec.Mirroring.Enabled && !rbdMirrorDebugLoggingEnabled {
 
 		err := r.Client.Create(r.ctx, getRbdMirrorDebugLoggingJob(sc, enableRbdMirrorDebugLoggingJobName, enableRbdMirrorDebugLoggingCommands))
 		if err != nil && !errors.IsAlreadyExists(err) {
@@ -190,7 +190,7 @@ ceph config rm mgr mgr/rbd_support/log_level
 		rbdMirrorDebugLoggingEnabled = true
 	}
 	// Mirroring is disabled but the debug logging is enabled
-	if !sc.Spec.Mirroring.Enabled && rbdMirrorDebugLoggingEnabled {
+	if (sc.Spec.Mirroring == nil || !sc.Spec.Mirroring.Enabled) && rbdMirrorDebugLoggingEnabled {
 		err := r.Client.Create(r.ctx, getRbdMirrorDebugLoggingJob(sc, disableRbdMirrorDebugLoggingJobName, disableRbdMirrorDebugLoggingCommands))
 		if err != nil && !errors.IsAlreadyExists(err) {
 			return reconcile.Result{}, err

diff --git a/controllers/storagecluster/cephrbdmirrors_test.go b/controllers/storagecluster/cephrbdmirrors_test.go
@@ -24,7 +24,7 @@ func TestCephRbdMirror(t *testing.T) {
 			label:                "create-ceph-rbd-mirror",
 			createRuntimeObjects: false,
 			spec: &api.StorageClusterSpec{
-				Mirroring: api.MirroringSpec{
+				Mirroring: &api.MirroringSpec{
 					Enabled:         true,
 					PeerSecretNames: []string{testPeerSecretName},
 				},
@@ -34,7 +34,7 @@ func TestCephRbdMirror(t *testing.T) {
 			label:                "delete-ceph-rbd-mirror",
 			createRuntimeObjects: false,
 			spec: &api.StorageClusterSpec{
-				Mirroring: api.MirroringSpec{
+				Mirroring: &api.MirroringSpec{
 					Enabled: false,
 				},
 			},

diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go
diff --git a/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/metrics/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/storagecluster_types.go
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1/zz_generated.deepcopy.go