diff --git a/pkg/daemon/ceph/client/upgrade.go b/pkg/daemon/ceph/client/upgrade.go index 5d7534386..027c646fc 100644 --- a/pkg/daemon/ceph/client/upgrade.go +++ b/pkg/daemon/ceph/client/upgrade.go @@ -99,20 +99,6 @@ func GetAllCephDaemonVersions(context *clusterd.Context, clusterInfo *ClusterInf return &cephVersionsResult, nil } -// EnableMessenger2 enable the messenger 2 protocol on Nautilus clusters -func EnableMessenger2(context *clusterd.Context, clusterInfo *ClusterInfo) error { - args := []string{"mon", "enable-msgr2"} - buf, err := NewCephCommand(context, clusterInfo, args).Run() - if err != nil { - return errors.Wrap(err, "failed to enable msgr2 protocol") - } - output := string(buf) - logger.Debug(output) - logger.Infof("successfully enabled msgr2 protocol") - - return nil -} - // EnableReleaseOSDFunctionality disallows pre-Nautilus OSDs and enables all new Nautilus-only functionality func EnableReleaseOSDFunctionality(context *clusterd.Context, clusterInfo *ClusterInfo, release string) error { args := []string{"osd", "require-osd-release", release} diff --git a/pkg/daemon/ceph/client/upgrade_test.go b/pkg/daemon/ceph/client/upgrade_test.go index 3d784790c..77e4c6a9e 100644 --- a/pkg/daemon/ceph/client/upgrade_test.go +++ b/pkg/daemon/ceph/client/upgrade_test.go @@ -53,19 +53,6 @@ func TestGetCephMonVersionsString(t *testing.T) { assert.Nil(t, err) } -func TestEnableMessenger2(t *testing.T) { - executor := &exectest.MockExecutor{} - executor.MockExecuteCommandWithOutput = func(command string, args ...string) (string, error) { - assert.Equal(t, "mon", args[0]) - assert.Equal(t, "enable-msgr2", args[1]) - return "", nil - } - context := &clusterd.Context{Executor: executor} - - err := EnableMessenger2(context, AdminTestClusterInfo("mycluster")) - assert.NoError(t, err) -} - func TestEnableReleaseOSDFunctionality(t *testing.T) { executor := &exectest.MockExecutor{} executor.MockExecuteCommandWithOutput = func(command string, args ...string) (string, error) { diff --git a/pkg/operator/ceph/cluster/cluster.go b/pkg/operator/ceph/cluster/cluster.go index cc1d7a130..cd7484a4f 100755 --- a/pkg/operator/ceph/cluster/cluster.go +++ b/pkg/operator/ceph/cluster/cluster.go @@ -496,11 +496,6 @@ func (c *cluster) postMonStartupActions() error { return errors.Wrap(err, "failed to create crash collector kubernetes secret") } - // Enable Ceph messenger 2 protocol on Nautilus - if err := client.EnableMessenger2(c.context, c.ClusterInfo); err != nil { - return errors.Wrap(err, "failed to enable Ceph messenger version 2") - } - // Always ensure the skip mds sanity checks setting is cleared, for all Pacific deployments if c.ClusterInfo.CephVersion.IsPacific() { if err := c.skipMDSSanityChecks(false); err != nil {