From c266c982c98c5fc67cd1c9b841ecb4ad86b6dbad Mon Sep 17 00:00:00 2001 From: taeuk_kim Date: Tue, 7 Apr 2020 07:06:35 +0000 Subject: [PATCH] Ceph: Add replica_size to replicated pool creation Add size parameter to pool create command instead of executing pool set command only for size This makes pool min_size reflect replica size. Co-authored-by: donggyu_park Signed-off-by: taeuk_kim --- pkg/daemon/ceph/client/pool.go | 2 +- pkg/daemon/ceph/client/pool_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/daemon/ceph/client/pool.go b/pkg/daemon/ceph/client/pool.go index 2ce427d94..faf6f6cfc 100644 --- a/pkg/daemon/ceph/client/pool.go +++ b/pkg/daemon/ceph/client/pool.go @@ -264,7 +264,7 @@ func CreateReplicatedPoolForApp(context *clusterd.Context, namespace, poolName s return err } - args := []string{"osd", "pool", "create", poolName, pgCount, "replicated", poolName} + args := []string{"osd", "pool", "create", poolName, pgCount, "replicated", poolName, "--size", strconv.FormatUint(uint64(pool.Replicated.Size), 10)} output, err := NewCephCommand(context, namespace, args).Run() if err != nil { return errors.Wrapf(err, "failed to create replicated pool %s. %s", poolName, string(output)) diff --git a/pkg/daemon/ceph/client/pool_test.go b/pkg/daemon/ceph/client/pool_test.go index cd44c13a1..83a4cc079 100644 --- a/pkg/daemon/ceph/client/pool_test.go +++ b/pkg/daemon/ceph/client/pool_test.go @@ -122,6 +122,8 @@ func testCreateReplicaPool(t *testing.T, failureDomain, crushRoot, deviceClass s if args[2] == "create" { assert.Equal(t, "mypool", args[3]) assert.Equal(t, "replicated", args[5]) + assert.Equal(t, "--size", args[7]) + assert.Equal(t, "12345", args[8]) return "", nil } if args[2] == "set" {