From: Venky Shankar Date: Mon, 31 Oct 2016 10:19:45 +0000 (+0530) Subject: rbd: add datapool config YAML to rbd suite X-Git-Tag: v11.1.1~58^2^2~34^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0d538a1438fd64d2f34f1dc2fc61922d825454ef;p=ceph.git rbd: add datapool config YAML to rbd suite - cli - librbd - qemu Signed-off-by: Venky Shankar --- diff --git a/suites/rbd/cli/cachepool/none.yaml b/suites/rbd/cli/cachepool/none.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/rbd/cli/cachepool/small.yaml b/suites/rbd/cli/cachepool/small.yaml deleted file mode 100644 index 8262be33044..00000000000 --- a/suites/rbd/cli/cachepool/small.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add rbd cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay rbd cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 60 - - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/cli/pool/ec-data-pool.yaml b/suites/rbd/cli/pool/ec-data-pool.yaml new file mode 100644 index 00000000000..63f159e2364 --- /dev/null +++ b/suites/rbd/cli/pool/ec-data-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd m=1 k=2 + - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/cli/pool/none.yaml b/suites/rbd/cli/pool/none.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/rbd/cli/pool/replicated-data-pool.yaml b/suites/rbd/cli/pool/replicated-data-pool.yaml new file mode 100644 index 00000000000..91c8c01e201 --- /dev/null +++ b/suites/rbd/cli/pool/replicated-data-pool.yaml @@ -0,0 +1,10 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create datapool 4 + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/cli/pool/small-cache-pool.yaml b/suites/rbd/cli/pool/small-cache-pool.yaml new file mode 100644 index 00000000000..8262be33044 --- /dev/null +++ b/suites/rbd/cli/pool/small-cache-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create cache 4 + - sudo ceph osd tier add rbd cache + - sudo ceph osd tier cache-mode cache writeback + - sudo ceph osd tier set-overlay rbd cache + - sudo ceph osd pool set cache hit_set_type bloom + - sudo ceph osd pool set cache hit_set_count 8 + - sudo ceph osd pool set cache hit_set_period 60 + - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/librbd/cachepool/none.yaml b/suites/rbd/librbd/cachepool/none.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/rbd/librbd/cachepool/small.yaml b/suites/rbd/librbd/cachepool/small.yaml deleted file mode 100644 index 8262be33044..00000000000 --- a/suites/rbd/librbd/cachepool/small.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add rbd cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay rbd cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 60 - - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/librbd/pool/ec-data-pool.yaml b/suites/rbd/librbd/pool/ec-data-pool.yaml new file mode 100644 index 00000000000..63f159e2364 --- /dev/null +++ b/suites/rbd/librbd/pool/ec-data-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd m=1 k=2 + - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/librbd/pool/none.yaml b/suites/rbd/librbd/pool/none.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/rbd/librbd/pool/replicated-data-pool.yaml b/suites/rbd/librbd/pool/replicated-data-pool.yaml new file mode 100644 index 00000000000..91c8c01e201 --- /dev/null +++ b/suites/rbd/librbd/pool/replicated-data-pool.yaml @@ -0,0 +1,10 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create datapool 4 + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/librbd/pool/small-cache-pool.yaml b/suites/rbd/librbd/pool/small-cache-pool.yaml new file mode 100644 index 00000000000..8262be33044 --- /dev/null +++ b/suites/rbd/librbd/pool/small-cache-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create cache 4 + - sudo ceph osd tier add rbd cache + - sudo ceph osd tier cache-mode cache writeback + - sudo ceph osd tier set-overlay rbd cache + - sudo ceph osd pool set cache hit_set_type bloom + - sudo ceph osd pool set cache hit_set_count 8 + - sudo ceph osd pool set cache hit_set_period 60 + - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/qemu/cachepool/ec-cache.yaml b/suites/rbd/qemu/cachepool/ec-cache.yaml deleted file mode 100644 index 554aba3b5d0..00000000000 --- a/suites/rbd/qemu/cachepool/ec-cache.yaml +++ /dev/null @@ -1,14 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd m=1 k=2 - - sudo ceph osd pool delete rbd rbd --yes-i-really-really-mean-it - - sudo ceph osd pool create rbd 4 4 erasure teuthologyprofile - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add rbd cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay rbd cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 60 - - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/qemu/cachepool/none.yaml b/suites/rbd/qemu/cachepool/none.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/suites/rbd/qemu/cachepool/small.yaml b/suites/rbd/qemu/cachepool/small.yaml deleted file mode 100644 index 8262be33044..00000000000 --- a/suites/rbd/qemu/cachepool/small.yaml +++ /dev/null @@ -1,11 +0,0 @@ -tasks: -- exec: - client.0: - - sudo ceph osd pool create cache 4 - - sudo ceph osd tier add rbd cache - - sudo ceph osd tier cache-mode cache writeback - - sudo ceph osd tier set-overlay rbd cache - - sudo ceph osd pool set cache hit_set_type bloom - - sudo ceph osd pool set cache hit_set_count 8 - - sudo ceph osd pool set cache hit_set_period 60 - - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/qemu/pool/ec-cache-pool.yaml b/suites/rbd/qemu/pool/ec-cache-pool.yaml new file mode 100644 index 00000000000..554aba3b5d0 --- /dev/null +++ b/suites/rbd/qemu/pool/ec-cache-pool.yaml @@ -0,0 +1,14 @@ +tasks: +- exec: + client.0: + - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd m=1 k=2 + - sudo ceph osd pool delete rbd rbd --yes-i-really-really-mean-it + - sudo ceph osd pool create rbd 4 4 erasure teuthologyprofile + - sudo ceph osd pool create cache 4 + - sudo ceph osd tier add rbd cache + - sudo ceph osd tier cache-mode cache writeback + - sudo ceph osd tier set-overlay rbd cache + - sudo ceph osd pool set cache hit_set_type bloom + - sudo ceph osd pool set cache hit_set_count 8 + - sudo ceph osd pool set cache hit_set_period 60 + - sudo ceph osd pool set cache target_max_objects 250 diff --git a/suites/rbd/qemu/pool/ec-data-pool.yaml b/suites/rbd/qemu/pool/ec-data-pool.yaml new file mode 100644 index 00000000000..63f159e2364 --- /dev/null +++ b/suites/rbd/qemu/pool/ec-data-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd erasure-code-profile set teuthologyprofile ruleset-failure-domain=osd m=1 k=2 + - sudo ceph osd pool create datapool 4 4 erasure teuthologyprofile + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/qemu/pool/none.yaml b/suites/rbd/qemu/pool/none.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/suites/rbd/qemu/pool/replicated-data-pool.yaml b/suites/rbd/qemu/pool/replicated-data-pool.yaml new file mode 100644 index 00000000000..91c8c01e201 --- /dev/null +++ b/suites/rbd/qemu/pool/replicated-data-pool.yaml @@ -0,0 +1,10 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create datapool 4 + +overrides: + ceph: + conf: + client: + rbd default data pool: datapool diff --git a/suites/rbd/qemu/pool/small-cache-pool.yaml b/suites/rbd/qemu/pool/small-cache-pool.yaml new file mode 100644 index 00000000000..8262be33044 --- /dev/null +++ b/suites/rbd/qemu/pool/small-cache-pool.yaml @@ -0,0 +1,11 @@ +tasks: +- exec: + client.0: + - sudo ceph osd pool create cache 4 + - sudo ceph osd tier add rbd cache + - sudo ceph osd tier cache-mode cache writeback + - sudo ceph osd tier set-overlay rbd cache + - sudo ceph osd pool set cache hit_set_type bloom + - sudo ceph osd pool set cache hit_set_count 8 + - sudo ceph osd pool set cache hit_set_period 60 + - sudo ceph osd pool set cache target_max_objects 250