From ee5e710912b2b78ef7bb1fa03a55beaf94184268 Mon Sep 17 00:00:00 2001 From: sp98 Date: Tue, 23 Jul 2024 21:31:19 +0530 Subject: [PATCH] core: set min-compat-client to reef for upmap-read If upmap-read balancer mode is required, then set min-compat-client to reef Signed-off-by: sp98 --- .../charts/rook-ceph/templates/resources.yaml | 1 + deploy/examples/crds.yaml | 1 + pkg/apis/ceph.rook.io/v1/types.go | 2 +- pkg/daemon/ceph/client/mgr.go | 36 +++++++++++++++---- pkg/daemon/ceph/client/mgr_test.go | 35 ++++++++++++++++++ 5 files changed, 68 insertions(+), 7 deletions(-) diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index a9ea8ce8d..561a39976 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -1601,6 +1601,7 @@ spec: - "" - crush-compat - upmap + - read - upmap-read type: string type: object diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index 62e5496c1..db0f88753 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -1599,6 +1599,7 @@ spec: - "" - crush-compat - upmap + - read - upmap-read type: string type: object diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index 8a3762573..745da47cf 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -679,7 +679,7 @@ type Module struct { type ModuleSettings struct { // BalancerMode sets the `balancer` module with different modes like `upmap`, `crush-compact` etc - // +kubebuilder:validation:Enum="";crush-compat;upmap;upmap-read + // +kubebuilder:validation:Enum="";crush-compat;upmap;read;upmap-read BalancerMode string `json:"balancerMode,omitempty"` } diff --git a/pkg/daemon/ceph/client/mgr.go b/pkg/daemon/ceph/client/mgr.go index d1dca7a19..06ec3d8ad 100755 --- a/pkg/daemon/ceph/client/mgr.go +++ b/pkg/daemon/ceph/client/mgr.go @@ -22,12 +22,18 @@ import ( "github.com/pkg/errors" "github.com/rook/rook/pkg/clusterd" + cephver "github.com/rook/rook/pkg/operator/ceph/version" ) var ( moduleEnableWaitTime = 5 * time.Second ) +const ( + readBalancerMode = "read" + upmapReadBalancerMode = "upmap-read" +) + func CephMgrMap(context *clusterd.Context, clusterInfo *ClusterInfo) (*MgrMap, error) { args := []string{"mgr", "dump"} buf, err := NewCephCommand(context, clusterInfo, args).Run() @@ -132,12 +138,12 @@ func setBalancerMode(context *clusterd.Context, clusterInfo *ClusterInfo, mode s return nil } -// setMinCompatClientLuminous set the minimum compatibility for clients to Luminous -func setMinCompatClientLuminous(context *clusterd.Context, clusterInfo *ClusterInfo) error { - args := []string{"osd", "set-require-min-compat-client", "luminous", "--yes-i-really-mean-it"} +// setMinCompatClient set the minimum compatibility for clients +func setMinCompatClient(context *clusterd.Context, clusterInfo *ClusterInfo, version string) error { + args := []string{"osd", "set-require-min-compat-client", version, "--yes-i-really-mean-it"} _, err := NewCephCommand(context, clusterInfo, args).Run() if err != nil { - return errors.Wrap(err, "failed to set set-require-min-compat-client to luminous") + return errors.Wrapf(err, "failed to set set-require-min-compat-client to %q", version) } return nil @@ -165,8 +171,12 @@ func mgrSetBalancerMode(context *clusterd.Context, clusterInfo *ClusterInfo, bal // ConfigureBalancerModule configures the balancer module func ConfigureBalancerModule(context *clusterd.Context, clusterInfo *ClusterInfo, balancerModuleMode string) error { - // Set min compat client to luminous before enabling the balancer mode "upmap" - err := setMinCompatClientLuminous(context, clusterInfo) + minCompatClientVersion, err := desiredMinCompatClientVersion(clusterInfo, balancerModuleMode) + if err != nil { + return errors.Wrap(err, "failed to get minimum compatibility client version") + } + + err = setMinCompatClient(context, clusterInfo, minCompatClientVersion) if err != nil { return errors.Wrap(err, "failed to set minimum compatibility client") } @@ -179,3 +189,17 @@ func ConfigureBalancerModule(context *clusterd.Context, clusterInfo *ClusterInfo return nil } + +func desiredMinCompatClientVersion(clusterInfo *ClusterInfo, balancerModuleMode string) (string, error) { + // Set min compat client to luminous before enabling the balancer mode "upmap" + minCompatClientVersion := "luminous" + if balancerModuleMode == readBalancerMode || balancerModuleMode == upmapReadBalancerMode { + if !clusterInfo.CephVersion.IsAtLeast(cephver.CephVersion{Major: 19}) { + return "", errors.New("minimum ceph v19 (Squid) is required for upmap-read or read balancer modes") + } + // Set min compat client to reef before enabling the balancer mode "upmap-read" or "read" + minCompatClientVersion = "reef" + } + + return minCompatClientVersion, nil +} diff --git a/pkg/daemon/ceph/client/mgr_test.go b/pkg/daemon/ceph/client/mgr_test.go index 3df997dca..762cd5874 100644 --- a/pkg/daemon/ceph/client/mgr_test.go +++ b/pkg/daemon/ceph/client/mgr_test.go @@ -21,6 +21,7 @@ import ( "github.com/pkg/errors" "github.com/rook/rook/pkg/clusterd" + cephver "github.com/rook/rook/pkg/operator/ceph/version" exectest "github.com/rook/rook/pkg/util/exec/test" "github.com/stretchr/testify/assert" ) @@ -135,3 +136,37 @@ func TestSetBalancerMode(t *testing.T) { err := setBalancerMode(&clusterd.Context{Executor: executor}, AdminTestClusterInfo("mycluster"), "upmap") assert.NoError(t, err) } + +func TestGetMinCompatClientVersion(t *testing.T) { + clusterInfo := AdminTestClusterInfo("mycluster") + t.Run("upmap-read balancer mode with ceph v19", func(t *testing.T) { + clusterInfo.CephVersion = cephver.CephVersion{Major: 19} + result, err := desiredMinCompatClientVersion(clusterInfo, upmapReadBalancerMode) + assert.NoError(t, err) + assert.Equal(t, "reef", result) + }) + + t.Run("read balancer mode with ceph v19", func(t *testing.T) { + clusterInfo.CephVersion = cephver.CephVersion{Major: 19} + result, err := desiredMinCompatClientVersion(clusterInfo, readBalancerMode) + assert.NoError(t, err) + assert.Equal(t, "reef", result) + }) + t.Run("upmap-read balancer mode with ceph below v19 should fail", func(t *testing.T) { + clusterInfo.CephVersion = cephver.CephVersion{Major: 18} + _, err := desiredMinCompatClientVersion(clusterInfo, upmapReadBalancerMode) + assert.Error(t, err) + }) + t.Run("read balancer mode with ceph below v19 should fail", func(t *testing.T) { + clusterInfo.CephVersion = cephver.CephVersion{Major: 18} + _, err := desiredMinCompatClientVersion(clusterInfo, readBalancerMode) + assert.Error(t, err) + }) + + t.Run("upmap balancer set min compat client to luminous", func(t *testing.T) { + clusterInfo.CephVersion = cephver.CephVersion{Major: 19} + result, err := desiredMinCompatClientVersion(clusterInfo, "upmap") + assert.NoError(t, err) + assert.Equal(t, "luminous", result) + }) +}