mon: no need to enable msgr2 since nautilus

Since Nautilus, mgr2 is already enabled by default. No longer
does the operator need to enable msgr2 after the mons are
configured or upgraded.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen committed 2022-03-10 11:48:47 -07:00
1 parent 5294678f05
commit 2b2231eb0c
3 files changed
-32

No files matched your search

-14
View File
@@ -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}
-13
View File
@@ -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) {
-5
View File
@@ -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 {