From: Brad Hubbard Date: Thu, 11 Apr 2019 07:29:30 +0000 (+1000) Subject: src/tests/crushtool: Add test for an empty default X-Git-Tag: v15.1.0~2942^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F27506%2Fhead;p=ceph.git src/tests/crushtool: Add test for an empty default Signed-off-by: Brad Hubbard --- diff --git a/src/test/cli/crushtool/empty-default.cushmap.txt b/src/test/cli/crushtool/empty-default.cushmap.txt new file mode 100644 index 000000000000..fc24d17aed9d --- /dev/null +++ b/src/test/cli/crushtool/empty-default.cushmap.txt @@ -0,0 +1,42 @@ +# begin crush map +tunable choose_local_tries 0 +tunable choose_local_fallback_tries 0 +tunable choose_total_tries 50 +tunable chooseleaf_descend_once 1 +tunable chooseleaf_vary_r 1 +tunable chooseleaf_stable 0 +tunable straw_calc_version 1 +tunable allowed_bucket_algs 22 + +# types +type 0 osd +type 1 host +type 2 chassis +type 3 rack +type 4 row +type 5 pdu +type 6 pod +type 7 room +type 8 datacenter +type 9 region +type 10 root + +# default bucket +root default { + id -1 # do not change unnecessarily + alg straw + hash 0 # rjenkins1 +} + +# rules +rule replicated_ruleset { + ruleset 0 + type replicated + min_size 1 + max_size 10 + step take default + step chooseleaf firstn 0 type host + step emit +} + +# end crush map diff --git a/src/test/cli/crushtool/empty-default.t b/src/test/cli/crushtool/empty-default.t new file mode 100644 index 000000000000..f99a9f091975 --- /dev/null +++ b/src/test/cli/crushtool/empty-default.t @@ -0,0 +1,2 @@ + $ crushtool -c "$TESTDIR/empty-default.cushmap.txt" + crushtool successfully built or modified map. Use '-o ' to write it out.