diff --git a/pkg/daemon/ceph/client/mirror.go b/pkg/daemon/ceph/client/mirror.go index 5f10c0dde..73eb9d3d8 100644 --- a/pkg/daemon/ceph/client/mirror.go +++ b/pkg/daemon/ceph/client/mirror.go @@ -97,6 +97,39 @@ func enablePoolMirroring(context *clusterd.Context, clusterInfo *ClusterInfo, po return nil } +// disablePoolMirroring turns off mirroring on a pool +func disablePoolMirroring(context *clusterd.Context, clusterInfo *ClusterInfo, poolName string) error { + logger.Infof("disabling mirroring for pool %q", poolName) + + // Build command + args := []string{"mirror", "pool", "disable", poolName} + cmd := NewRBDCommand(context, clusterInfo, args) + + // Run command + output, err := cmd.Run() + if err != nil { + return errors.Wrapf(err, "failed to disable mirroring for pool %q. %s", poolName, output) + } + + return nil +} + +func removeClusterPeer(context *clusterd.Context, clusterInfo *ClusterInfo, poolName, peerUUID string) error { + logger.Infof("removing cluster peer with UUID %q for the pool %q", peerUUID, poolName) + + // Build command + args := []string{"mirror", "pool", "peer", "remove", poolName, peerUUID} + cmd := NewRBDCommand(context, clusterInfo, args) + + // Run command + output, err := cmd.Run() + if err != nil { + return errors.Wrapf(err, "failed to remove cluster peer with UUID %q for the pool %q. %s", peerUUID, poolName, output) + } + + return nil +} + // GetPoolMirroringStatus prints the pool mirroring status func GetPoolMirroringStatus(context *clusterd.Context, clusterInfo *ClusterInfo, poolName string) (*cephv1.PoolMirroringStatus, error) { logger.Debugf("retrieving mirroring pool %q status", poolName) diff --git a/pkg/daemon/ceph/client/mirror_test.go b/pkg/daemon/ceph/client/mirror_test.go index 33ba287fd..cfa4f09da 100644 --- a/pkg/daemon/ceph/client/mirror_test.go +++ b/pkg/daemon/ceph/client/mirror_test.go @@ -303,3 +303,42 @@ func TestRemoveSnapshotSchedules(t *testing.T) { err := removeSnapshotSchedules(context, AdminClusterInfo("mycluster"), *poolSpec, pool) assert.NoError(t, err) } + +func TestDisableMirroring(t *testing.T) { + pool := "pool-test" + executor := &exectest.MockExecutor{} + executor.MockExecuteCommandWithOutput = func(command string, args ...string) (string, error) { + if args[0] == "mirror" { + assert.Equal(t, "pool", args[1]) + assert.Equal(t, "disable", args[2]) + assert.Equal(t, pool, args[3]) + return "", nil + } + return "", errors.New("unknown command") + } + context := &clusterd.Context{Executor: executor} + + err := disablePoolMirroring(context, AdminClusterInfo("mycluster"), pool) + assert.NoError(t, err) +} + +func TestRemoveClusterPeer(t *testing.T) { + pool := "pool-test" + peerUUID := "39ae33fb-1dd6-4f9b-8ed7-0e4517068900" + executor := &exectest.MockExecutor{} + executor.MockExecuteCommandWithOutput = func(command string, args ...string) (string, error) { + if args[0] == "mirror" { + assert.Equal(t, "pool", args[1]) + assert.Equal(t, "peer", args[2]) + assert.Equal(t, "remove", args[3]) + assert.Equal(t, pool, args[4]) + assert.Equal(t, peerUUID, args[5]) + return "", nil + } + return "", errors.New("unknown command") + } + context := &clusterd.Context{Executor: executor} + + err := removeClusterPeer(context, AdminClusterInfo("mycluster"), pool, peerUUID) + assert.NoError(t, err) +} diff --git a/pkg/daemon/ceph/client/pool.go b/pkg/daemon/ceph/client/pool.go index bc340d291..e1500b0d0 100644 --- a/pkg/daemon/ceph/client/pool.go +++ b/pkg/daemon/ceph/client/pool.go @@ -281,6 +281,30 @@ func setCommonPoolProperties(context *clusterd.Context, clusterInfo *ClusterInfo return errors.Wrapf(err, "failed to enable snapshot scheduling for pool %q", poolName) } } + } else { + if pool.Mirroring.Mode == "pool" { + // Remove storage cluster peers + mirrorInfo, err := GetPoolMirroringInfo(context, clusterInfo, poolName) + if err != nil { + return errors.Wrapf(err, "failed to get mirroring info for the pool %q", poolName) + } + for _, peer := range mirrorInfo.Peers { + if peer.UUID != "" { + err := removeClusterPeer(context, clusterInfo, poolName, peer.UUID) + if err != nil { + return errors.Wrapf(err, "failed to remove cluster peer with UUID %q for the pool %q", peer.UUID, poolName) + } + } + } + + // Disable mirroring + err = disablePoolMirroring(context, clusterInfo, poolName) + if err != nil { + return errors.Wrapf(err, "failed to disable mirroring for pool %q", poolName) + } + } else if pool.Mirroring.Mode == "image" { + logger.Warningf("manually disable mirroring on images in the pool %q", poolName) + } } // set maxSize quota diff --git a/pkg/operator/ceph/pool/controller.go b/pkg/operator/ceph/pool/controller.go index 545807c78..ca2bb72f5 100644 --- a/pkg/operator/ceph/pool/controller.go +++ b/pkg/operator/ceph/pool/controller.go @@ -209,11 +209,7 @@ func (r *ReconcileCephBlockPool) reconcile(request reconcile.Request) (reconcile // If the ceph block pool is still in the map, we must remove it during CR deletion // We must remove it first otherwise the checker will panic since the status/info will be nil if poolChannelExists { - // Close the channel to stop the mirroring status - close(r.blockPoolChannels[blockPoolChannelKey].stopChan) - - // Remove ceph block pool from the map - delete(r.blockPoolChannels, blockPoolChannelKey) + r.cancelMirrorMonitoring(blockPoolChannelKey) } logger.Infof("deleting pool %q", cephBlockPool.Name) @@ -281,6 +277,7 @@ func (r *ReconcileCephBlockPool) reconcile(request reconcile.Request) (reconcile return reconcile.Result{}, errors.Wrap(err, "failed to enable/disable stats collection for pool(s)") } + checker := newMirrorChecker(r.context, r.client, r.clusterInfo, request.NamespacedName, &cephBlockPool.Spec, cephBlockPool.Name) // ADD PEERS logger.Debug("reconciling create rbd mirror peer configuration") if cephBlockPool.Spec.Mirroring.Enabled { @@ -299,7 +296,6 @@ func (r *ReconcileCephBlockPool) reconcile(request reconcile.Request) (reconcile if r.blockPoolChannels[blockPoolChannelKey].monitoringRunning { logger.Debug("external rgw endpoint monitoring go routine already running!") } else { - checker := newMirrorChecker(r.context, r.client, r.clusterInfo, request.NamespacedName, &cephBlockPool.Spec, cephBlockPool.Name) r.blockPoolChannels[blockPoolChannelKey].monitoringRunning = true go checker.checkMirroring(r.blockPoolChannels[blockPoolChannelKey].stopChan) } @@ -312,6 +308,13 @@ func (r *ReconcileCephBlockPool) reconcile(request reconcile.Request) (reconcile } else { // Set Ready status, we are done reconciling updateStatus(r.client, request.NamespacedName, cephv1.ConditionReady, nil) + + // Stop monitoring the mirroring status of this pool + if poolChannelExists && r.blockPoolChannels[blockPoolChannelKey].monitoringRunning { + r.cancelMirrorMonitoring(blockPoolChannelKey) + // Reset the MirrorHealthCheckSpec + checker.updateStatusMirroring(nil, nil, nil, "") + } } // Return and do not requeue @@ -383,3 +386,11 @@ func configureRBDStats(clusterContext *clusterd.Context, clusterInfo *cephclient logger.Debug("configured RBD per-image IO statistics collection") return nil } + +func (r *ReconcileCephBlockPool) cancelMirrorMonitoring(cephBlockPoolName string) { + // Close the channel to stop the mirroring status + close(r.blockPoolChannels[cephBlockPoolName].stopChan) + + // Remove ceph block pool from the map + delete(r.blockPoolChannels, cephBlockPoolName) +} diff --git a/pkg/operator/ceph/pool/controller_test.go b/pkg/operator/ceph/pool/controller_test.go index 9eef16605..1fe16729a 100644 --- a/pkg/operator/ceph/pool/controller_test.go +++ b/pkg/operator/ceph/pool/controller_test.go @@ -374,6 +374,27 @@ func TestCephBlockPoolController(t *testing.T) { assert.NotEmpty(t, myPeerSecret.Data["token"], myPeerSecret.Data) assert.NotEmpty(t, myPeerSecret.Data["pool"]) } + + // + // TEST 6: Mirroring disabled + r = &ReconcileCephBlockPool{ + client: cl, + scheme: s, + context: c, + blockPoolChannels: make(map[string]*blockPoolHealth), + } + pool.Spec.Mirroring.Enabled = false + pool.Spec.Mirroring.Mode = "image" + err = r.client.Update(context.TODO(), pool) + assert.NoError(t, err) + res, err = r.Reconcile(ctx, req) + assert.NoError(t, err) + assert.False(t, res.Requeue) + err = r.client.Get(context.TODO(), req.NamespacedName, pool) + assert.NoError(t, err) + assert.Equal(t, cephv1.ConditionReady, pool.Status.Phase) + + assert.Nil(t, pool.Status.MirroringStatus) } func TestConfigureRBDStats(t *testing.T) { diff --git a/pkg/operator/ceph/pool/validate.go b/pkg/operator/ceph/pool/validate.go index 008d9b914..af00be04b 100644 --- a/pkg/operator/ceph/pool/validate.go +++ b/pkg/operator/ceph/pool/validate.go @@ -166,7 +166,7 @@ func ValidatePoolSpec(context *clusterd.Context, clusterInfo *cephclient.Cluster } if !p.Mirroring.Enabled && p.Mirroring.SnapshotSchedulesEnabled() { - return errors.New("mirroring must be enabled to configure snapshot scheduling") + logger.Warning("mirroring must be enabled to configure snapshot scheduling") } return nil diff --git a/pkg/operator/ceph/pool/validate_test.go b/pkg/operator/ceph/pool/validate_test.go index 677f56bce..2c515291c 100644 --- a/pkg/operator/ceph/pool/validate_test.go +++ b/pkg/operator/ceph/pool/validate_test.go @@ -164,12 +164,6 @@ func TestValidatePool(t *testing.T) { p.Spec.Mirroring.SnapshotSchedules = []cephv1.SnapshotScheduleSpec{{Interval: "24h"}} err = ValidatePool(context, clusterInfo, clusterSpec, &p) assert.NoError(t, err) - - // Error mirror is disabled but snap schedule is enabled - p.Spec.Mirroring.Enabled = false - err = ValidatePool(context, clusterInfo, clusterSpec, &p) - assert.Error(t, err) - assert.EqualError(t, err, "mirroring must be enabled to configure snapshot scheduling") } // Failure and subfailure domains