From aeda710840e10030a1df8ea3157374a3a5fadd2b Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 15 Oct 2025 11:58:36 -0600 Subject: [PATCH] pool: skip setting the target size ratio to 0 by default The target size ratio is currently always being set to 0, when neither the legacy targetSizeRatio nor the parameter for target_size_ratio are set. In this case, we should not set it to 0, but rather should skip the command to set the target size ratio. Signed-off-by: Travis Nielsen (cherry picked from commit 938380734d9a3d57fa5d56c3912347b8c7039f8a) --- pkg/daemon/ceph/client/pool.go | 2 +- pkg/operator/ceph/file/filesystem_test.go | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/pkg/daemon/ceph/client/pool.go b/pkg/daemon/ceph/client/pool.go index 0f8981250..5584466d7 100644 --- a/pkg/daemon/ceph/client/pool.go +++ b/pkg/daemon/ceph/client/pool.go @@ -340,7 +340,7 @@ func setCommonPoolProperties(context *clusterd.Context, clusterInfo *ClusterInfo pool.Parameters = make(map[string]string) } - if _, ok := pool.Parameters[targetSizeRatioProperty]; !ok { + if _, ok := pool.Parameters[targetSizeRatioProperty]; !ok && pool.Replicated.TargetSizeRatio != 0 { pool.Parameters[targetSizeRatioProperty] = strconv.FormatFloat(pool.Replicated.TargetSizeRatio, 'f', -1, 32) } diff --git a/pkg/operator/ceph/file/filesystem_test.go b/pkg/operator/ceph/file/filesystem_test.go index 0bad54495..a8adad07f 100644 --- a/pkg/operator/ceph/file/filesystem_test.go +++ b/pkg/operator/ceph/file/filesystem_test.go @@ -310,22 +310,6 @@ func fsExecutor(t *testing.T, fsName, configDir string, multiFS bool, createData return "", nil } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-data1", "size", "1"}) { return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-metadata", "target_size_ratio", "0"}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-data0", "target_size_ratio", "0"}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-data1", "target_size_ratio", "0"}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-named-pool", "target_size_ratio", "0"}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-metadata", "compression_mode", ""}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-data0", "compression_mode", ""}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-data1", "compression_mode", ""}) { - return "", nil - } else if reflect.DeepEqual(args[0:6], []string{"osd", "pool", "set", fsName + "-named-pool", "compression_mode", ""}) { - return "", nil } else if reflect.DeepEqual(args[0:4], []string{"fs", "add_data_pool", fsName, fsName + "-data1"}) { *addDataPoolCount++ return "", nil