From: Sage Weil Date: Sat, 8 Jul 2017 02:34:58 +0000 (-0400) Subject: test/cli/crushtool: fix rules.t X-Git-Tag: v12.1.1~105^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16027%2Fhead;p=ceph.git test/cli/crushtool: fix rules.t Signed-off-by: Sage Weil --- diff --git a/src/test/cli/crushtool/rules.t b/src/test/cli/crushtool/rules.t index 68ead0b1b0e8..bda3c13a4444 100644 --- a/src/test/cli/crushtool/rules.t +++ b/src/test/cli/crushtool/rules.t @@ -1,7 +1,7 @@ $ crushtool -c $TESTDIR/rules.txt --create-replicated-rule foo default host -o one > /dev/null $ crushtool -d one # begin crush map - + # devices device 0 osd.0 class ssd device 1 osd.1 class ssd @@ -9,12 +9,12 @@ device 3 osd.3 class hdd device 4 osd.4 class hdd device 5 osd.5 class hdd - + # types type 0 osd type 1 host type 2 root - + # buckets host foo { \tid -3\t\t# do not change unnecessarily (esc) @@ -48,7 +48,7 @@ \titem foo weight 3.000 (esc) \titem bar weight 3.000 (esc) } - + # rules rule data { \truleset 0 (esc) @@ -68,17 +68,22 @@ \tstep chooseleaf firstn 0 type host (esc) \tstep emit (esc) } - + # end crush map + + + + + $ crushtool -c $TESTDIR/rules.txt --create-replicated-rule foo-ssd default host -o two --device-class ssd > /dev/null $ crushtool -d two # begin crush map - + # devices device 0 osd.0 class ssd device 1 osd.1 class ssd @@ -86,12 +91,12 @@ device 3 osd.3 class hdd device 4 osd.4 class hdd device 5 osd.5 class hdd - + # types type 0 osd type 1 host type 2 root - + # buckets host foo { \tid -3\t\t# do not change unnecessarily (esc) @@ -125,7 +130,7 @@ \titem foo weight 3.000 (esc) \titem bar weight 3.000 (esc) } - + # rules rule data { \truleset 0 (esc) @@ -145,5 +150,10 @@ \tstep chooseleaf firstn 0 type host (esc) \tstep emit (esc) } - + # end crush map + + + + +