mon: remove quincy check since quincy is min version

With the removal of Ceph Pacific support, no need to check if Quincy
is avaiable to support encryption on the wire.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
(cherry picked from commit 25d36c4c75)
This commit is contained in:
Travis Nielsen authored and Mergify committed 2024-05-01 21:39:11 +00:00
1 parent a4b4e7d319
commit fff583b4b3
1 file changed
+13 -18
+13 -18
View File
@@ -656,26 +656,21 @@ func (c *cluster) configureMsgr2() error {
}
}
// Set network compression
if c.ClusterInfo.CephVersion.IsAtLeastQuincy() {
if c.Spec.Network.Connections == nil || c.Spec.Network.Connections.Compression == nil || !c.Spec.Network.Connections.Compression.Enabled {
encryptionConfig := []config.Option{
{Who: "global", Option: "ms_osd_compress_mode"},
}
if err := monStore.DeleteAll(encryptionConfig...); err != nil {
return errors.Wrap(err, "failed to delete msgr2 compression settings")
}
} else {
globalConfigSettings := map[string]string{
"ms_osd_compress_mode": "force",
}
logger.Infof("setting msgr2 compression mode to %q", "force")
if err := monStore.SetAll("global", globalConfigSettings); err != nil {
return err
}
if c.Spec.Network.Connections == nil || c.Spec.Network.Connections.Compression == nil || !c.Spec.Network.Connections.Compression.Enabled {
encryptionConfig := []config.Option{
{Who: "global", Option: "ms_osd_compress_mode"},
}
if err := monStore.DeleteAll(encryptionConfig...); err != nil {
return errors.Wrap(err, "failed to delete msgr2 compression settings")
}
} else {
logger.Warningf("network compression requires Ceph Quincy (v17) or newer, skipping for current ceph %q", c.ClusterInfo.CephVersion.String())
globalConfigSettings := map[string]string{
"ms_osd_compress_mode": "force",
}
logger.Infof("setting msgr2 compression mode to %q", "force")
if err := monStore.SetAll("global", globalConfigSettings); err != nil {
return err
}
}
return nil