diff options
| author | Kefu Chai <kchai@redhat.com> | 2021-04-03 16:19:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-03 16:19:07 +0200 |
| commit | 889d850ba6f3143eeea096e36d0acf2d7e2c1b05 (patch) | |
| tree | 2ab2241ffca775e8f77dc817f22fa01a2fab329a | |
| parent | Merge pull request #38258 from badone/wip-tracker-48336-monmaptool-enforce-ip... (diff) | |
| parent | crush/CrushCompiler: print weight with uniform precision (diff) | |
| download | ceph-889d850ba6f3143eeea096e36d0acf2d7e2c1b05.tar.xz ceph-889d850ba6f3143eeea096e36d0acf2d7e2c1b05.zip | |
Merge pull request #38500 from pdvian/wip-print-weight
crush/CrushCompiler: print weight with uniform precision
Reviewed-by: Kefu Chai <kchai@redhat.com>
36 files changed, 799 insertions, 799 deletions
diff --git a/qa/standalone/crush/crush-choose-args.sh b/qa/standalone/crush/crush-choose-args.sh index daadc2a8571..ee548db12e5 100755 --- a/qa/standalone/crush/crush-choose-args.sh +++ b/qa/standalone/crush/crush-choose-args.sh @@ -62,16 +62,16 @@ choose_args 0 { { bucket_id -1 weight_set [ - [ 2.000 ] - [ 2.000 ] + [ 2.00000 ] + [ 2.00000 ] ] ids [ -10 ] } { bucket_id -2 weight_set [ - [ 2.000 ] - [ 2.000 ] + [ 2.00000 ] + [ 2.00000 ] ] ids [ -20 ] } @@ -121,16 +121,16 @@ choose_args 0 { { bucket_id -1 weight_set [ - [ 2.000 ] - [ 1.000 ] + [ 2.00000 ] + [ 1.00000 ] ] ids [ -10 ] } { bucket_id -2 weight_set [ - [ 2.000 ] - [ 1.000 ] + [ 2.00000 ] + [ 1.00000 ] ] ids [ -20 ] } diff --git a/src/crush/CrushCompiler.cc b/src/crush/CrushCompiler.cc index eafda63afa7..007e7457d1b 100644 --- a/src/crush/CrushCompiler.cc +++ b/src/crush/CrushCompiler.cc @@ -88,7 +88,7 @@ static void print_rule_name(ostream& out, int t, CrushWrapper &crush) static void print_fixedpoint(ostream& out, int i) { char s[20]; - snprintf(s, sizeof(s), "%.3f", (float)i / (float)0x10000); + snprintf(s, sizeof(s), "%.5f", (float)i / (float)0x10000); out << s; } diff --git a/src/test/cli/crushtool/add-bucket.t b/src/test/cli/crushtool/add-bucket.t index b6c3cedc8e7..b09367df14c 100644 --- a/src/test/cli/crushtool/add-bucket.t +++ b/src/test/cli/crushtool/add-bucket.t @@ -17,24 +17,24 @@ # buckets host host0 { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 1.000 (esc) + \t# weight 1.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem device1 weight 1.000 (esc) + \titem device1 weight 1.00000 (esc) } host host1 { \tid -3\t\t# do not change unnecessarily (esc) - \t# weight 0.000 (esc) + \t# weight 0.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) } cluster cluster0 { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 1.000 (esc) + \t# weight 1.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem host0 weight 1.000 (esc) - \titem host1 weight 0.000 (esc) + \titem host0 weight 1.00000 (esc) + \titem host1 weight 0.00000 (esc) } # rules diff --git a/src/test/cli/crushtool/add-item.t b/src/test/cli/crushtool/add-item.t index 17127db590f..b0e4601d673 100644 --- a/src/test/cli/crushtool/add-item.t +++ b/src/test/cli/crushtool/add-item.t @@ -16,18 +16,18 @@ # buckets host host0 { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 2.000 (esc) + \t# weight 2.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem device0 weight 1.000 (esc) - \titem device1 weight 1.000 (esc) + \titem device0 weight 1.00000 (esc) + \titem device1 weight 1.00000 (esc) } cluster cluster0 { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 2.000 (esc) + \t# weight 2.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem host0 weight 2.000 (esc) + \titem host0 weight 2.00000 (esc) } # rules @@ -85,18 +85,18 @@ # buckets host host0 { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 2.000 (esc) + \t# weight 2.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem device0 weight 1.000 (esc) - \titem device1 weight 1.000 (esc) + \titem device0 weight 1.00000 (esc) + \titem device1 weight 1.00000 (esc) } cluster cluster0 { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 2.000 (esc) + \t# weight 2.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem host0 weight 2.000 (esc) + \titem host0 weight 2.00000 (esc) } # rules diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t index ec81a4ee839..d01d43aa0de 100644 --- a/src/test/cli/crushtool/arg-order-checks.t +++ b/src/test/cli/crushtool/arg-order-checks.t @@ -88,104 +88,104 @@ # buckets node node0 { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 103.000 (esc) + \t# weight 103.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.0 weight 1.000 (esc) - \titem osd.1 weight 1.000 (esc) - \titem osd.2 weight 99.000 (esc) - \titem osd.3 weight 1.000 (esc) - \titem osd.4 weight 1.000 (esc) + \titem osd.0 weight 1.00000 (esc) + \titem osd.1 weight 1.00000 (esc) + \titem osd.2 weight 99.00000 (esc) + \titem osd.3 weight 1.00000 (esc) + \titem osd.4 weight 1.00000 (esc) } node node1 { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.5 weight 1.000 (esc) - \titem osd.6 weight 1.000 (esc) - \titem osd.7 weight 1.000 (esc) - \titem osd.8 weight 1.000 (esc) - \titem osd.9 weight 1.000 (esc) + \titem osd.5 weight 1.00000 (esc) + \titem osd.6 weight 1.00000 (esc) + \titem osd.7 weight 1.00000 (esc) + \titem osd.8 weight 1.00000 (esc) + \titem osd.9 weight 1.00000 (esc) } node node2 { \tid -3\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.10 weight 1.000 (esc) - \titem osd.11 weight 1.000 (esc) - \titem osd.12 weight 1.000 (esc) - \titem osd.13 weight 1.000 (esc) - \titem osd.14 weight 1.000 (esc) + \titem osd.10 weight 1.00000 (esc) + \titem osd.11 weight 1.00000 (esc) + \titem osd.12 weight 1.00000 (esc) + \titem osd.13 weight 1.00000 (esc) + \titem osd.14 weight 1.00000 (esc) } node node3 { \tid -4\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.15 weight 1.000 (esc) - \titem osd.16 weight 1.000 (esc) - \titem osd.17 weight 1.000 (esc) - \titem osd.18 weight 1.000 (esc) - \titem osd.19 weight 1.000 (esc) + \titem osd.15 weight 1.00000 (esc) + \titem osd.16 weight 1.00000 (esc) + \titem osd.17 weight 1.00000 (esc) + \titem osd.18 weight 1.00000 (esc) + \titem osd.19 weight 1.00000 (esc) } node node4 { \tid -5\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.20 weight 1.000 (esc) - \titem osd.21 weight 1.000 (esc) - \titem osd.22 weight 1.000 (esc) - \titem osd.23 weight 1.000 (esc) - \titem osd.24 weight 1.000 (esc) + \titem osd.20 weight 1.00000 (esc) + \titem osd.21 weight 1.00000 (esc) + \titem osd.22 weight 1.00000 (esc) + \titem osd.23 weight 1.00000 (esc) + \titem osd.24 weight 1.00000 (esc) } rack rack0 { \tid -6\t\t# do not change unnecessarily (esc) - \t# weight 103.000 (esc) + \t# weight 103.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem node0 weight 103.000 (esc) + \titem node0 weight 103.00000 (esc) } rack rack1 { \tid -7\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem node1 weight 5.000 (esc) + \titem node1 weight 5.00000 (esc) } rack rack2 { \tid -8\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem node2 weight 5.000 (esc) + \titem node2 weight 5.00000 (esc) } rack rack3 { \tid -9\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem node3 weight 5.000 (esc) + \titem node3 weight 5.00000 (esc) } rack rack4 { \tid -10\t\t# do not change unnecessarily (esc) - \t# weight 5.000 (esc) + \t# weight 5.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem node4 weight 5.000 (esc) + \titem node4 weight 5.00000 (esc) } root root { \tid -11\t\t# do not change unnecessarily (esc) - \t# weight 123.000 (esc) + \t# weight 123.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem rack0 weight 103.000 (esc) - \titem rack1 weight 5.000 (esc) - \titem rack2 weight 5.000 (esc) - \titem rack3 weight 5.000 (esc) - \titem rack4 weight 5.000 (esc) + \titem rack0 weight 103.00000 (esc) + \titem rack1 weight 5.00000 (esc) + \titem rack2 weight 5.00000 (esc) + \titem rack3 weight 5.00000 (esc) + \titem rack4 weight 5.00000 (esc) } # rules diff --git a/src/test/cli/crushtool/bad-mappings.crushmap.txt b/src/test/cli/crushtool/bad-mappings.crushmap.txt index a3d5dfee01f..21b5981914c 100644 --- a/src/test/cli/crushtool/bad-mappings.crushmap.txt +++ b/src/test/cli/crushtool/bad-mappings.crushmap.txt @@ -11,11 +11,11 @@ domain root { id -1 alg straw hash 0 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 - item device3 weight 1.000 - item device4 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 + item device3 weight 1.00000 + item device4 weight 1.00000 } rule rule-firstn { diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t index 4061d8fb4a4..f50b64084c1 100644 --- a/src/test/cli/crushtool/build.t +++ b/src/test/cli/crushtool/build.t @@ -44,10 +44,10 @@ # buckets root root { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 1.000 (esc) + \t# weight 1.00000 (esc) \talg straw (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.0 weight 1.000 (esc) + \titem osd.0 weight 1.00000 (esc) } # rules diff --git a/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt b/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt index cd888635a35..4be115108b9 100644 --- a/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt +++ b/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt @@ -11,11 +11,11 @@ host host0 { id -1 alg straw hash 0 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 - item device3 weight 1.000 - item device4 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 + item device3 weight 1.00000 + item device4 weight 1.00000 } rule rule-r0 { diff --git a/src/test/cli/crushtool/choose-args.crush b/src/test/cli/crushtool/choose-args.crush index 38eafe9a355..ed0bc962c39 100644 --- a/src/test/cli/crushtool/choose-args.crush +++ b/src/test/cli/crushtool/choose-args.crush @@ -14,40 +14,40 @@ type 3 root # buckets host host0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw2 hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw2 hash 0 # rjenkins1 - item device1 weight 1.000 + item device1 weight 1.00000 } host host2 { id -5 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw2 hash 0 # rjenkins1 - item device2 weight 1.000 + item device2 weight 1.00000 } rack rack0 { id -3 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw2 hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 1.000 - item host2 weight 1.000 + item host0 weight 1.00000 + item host1 weight 1.00000 + item host2 weight 1.00000 } root root { id -4 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw2 hash 0 # rjenkins1 - item rack0 weight 4.000 + item rack0 weight 4.00000 } # rules @@ -74,8 +74,8 @@ choose_args 3 { { bucket_id -3 weight_set [ - [ 1.000 2.000 5.000 ] - [ 3.000 2.000 5.000 ] + [ 1.00000 2.00000 5.00000 ] + [ 3.00000 2.00000 5.00000 ] ] ids [ -20 -30 -25 ] } @@ -84,8 +84,8 @@ choose_args 4 { { bucket_id -2 weight_set [ - [ 1.000 ] - [ 3.000 ] + [ 1.00000 ] + [ 3.00000 ] ] } } @@ -103,15 +103,15 @@ choose_args 6 { { bucket_id -2 weight_set [ - [ 1.000 ] - [ 3.000 ] + [ 1.00000 ] + [ 3.00000 ] ] } { bucket_id -3 weight_set [ - [ 1.000 2.000 5.000 ] - [ 3.000 2.000 5.000 ] + [ 1.00000 2.00000 5.00000 ] + [ 3.00000 2.00000 5.00000 ] ] ids [ -20 -30 -25 ] } diff --git a/src/test/cli/crushtool/device-class.crush b/src/test/cli/crushtool/device-class.crush index a3c1a1f0eab..106f3816fd0 100644 --- a/src/test/cli/crushtool/device-class.crush +++ b/src/test/cli/crushtool/device-class.crush @@ -16,48 +16,48 @@ host host0 { id -1 # do not change unnecessarily id -6 class ssd # do not change unnecessarily id -11 class hdd # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { id -2 # do not change unnecessarily id -7 class ssd # do not change unnecessarily id -12 class hdd # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device1 weight 1.000 + item device1 weight 1.00000 } host host2 { id -5 # do not change unnecessarily id -8 class ssd # do not change unnecessarily id -13 class hdd # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device2 weight 1.000 + item device2 weight 1.00000 } rack rack0 { id -3 # do not change unnecessarily id -9 class ssd # do not change unnecessarily id -14 class hdd # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 1.000 - item host2 weight 1.000 + item host0 weight 1.00000 + item host1 weight 1.00000 + item host2 weight 1.00000 } root root { id -4 # do not change unnecessarily id -10 class ssd # do not change unnecessarily id -15 class hdd # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item rack0 weight 4.000 + item rack0 weight 4.00000 } # rules diff --git a/src/test/cli/crushtool/missing-bucket.crushmap.txt b/src/test/cli/crushtool/missing-bucket.crushmap.txt index 4ef7f446035..6d40af3297d 100644 --- a/src/test/cli/crushtool/missing-bucket.crushmap.txt +++ b/src/test/cli/crushtool/missing-bucket.crushmap.txt @@ -11,11 +11,11 @@ domain root { id -1 alg straw hash 0 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 - item device3 weight 1.000 - item device4 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 + item device3 weight 1.00000 + item device4 weight 1.00000 } rule rule-bad { diff --git a/src/test/cli/crushtool/multitype.after b/src/test/cli/crushtool/multitype.after index 15bfd9af374..9f4b1fd5707 100644 --- a/src/test/cli/crushtool/multitype.after +++ b/src/test/cli/crushtool/multitype.after @@ -20,39 +20,39 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item osd0 weight 2.000 - item osd1 weight 1.000 + item osd0 weight 2.00000 + item osd1 weight 1.00000 } host host1 { id -3 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg list # add new items at the end; do not change order unnecessarily hash 0 # rjenkins1 - item osd3 weight 2.000 - item osd4 weight 1.000 + item osd3 weight 2.00000 + item osd4 weight 1.00000 } host host2 { id -4 # do not change unnecessarily - # weight 5.500 + # weight 5.50000 alg tree # do not change pos for existing items unnecessarily hash 0 # rjenkins1 - item osd5 weight 1.000 pos 0 - item osd6 weight 2.000 pos 1 - item osd7 weight 0.500 pos 2 - item osd8 weight 1.000 pos 3 - item osd9 weight 1.000 pos 4 + item osd5 weight 1.00000 pos 0 + item osd6 weight 2.00000 pos 1 + item osd7 weight 0.50000 pos 2 + item osd8 weight 1.00000 pos 3 + item osd9 weight 1.00000 pos 4 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 11.500 + # weight 11.50000 alg straw hash 0 # rjenkins1 - item host0 weight 3.000 - item host1 weight 3.000 - item host2 weight 5.500 + item host0 weight 3.00000 + item host1 weight 3.00000 + item host2 weight 5.50000 } # rules diff --git a/src/test/cli/crushtool/multitype.before b/src/test/cli/crushtool/multitype.before index 8adcda9c3b7..2727dcae158 100644 --- a/src/test/cli/crushtool/multitype.before +++ b/src/test/cli/crushtool/multitype.before @@ -20,39 +20,39 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item osd0 weight 1.000 - item osd1 weight 1.000 + item osd0 weight 1.00000 + item osd1 weight 1.00000 } host host1 { id -3 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg list hash 0 # rjenkins1 - item osd3 weight 1.000 - item osd4 weight 1.000 + item osd3 weight 1.00000 + item osd4 weight 1.00000 } host host2 { id -4 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg tree hash 0 # rjenkins1 - item osd5 weight 1.000 - item osd6 weight 1.000 - item osd7 weight 1.000 - item osd8 weight 1.000 - item osd9 weight 1.000 + item osd5 weight 1.00000 + item osd6 weight 1.00000 + item osd7 weight 1.00000 + item osd8 weight 1.00000 + item osd9 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item host0 weight 2.000 - item host1 weight 2.000 - item host2 weight 5.000 + item host0 weight 2.00000 + item host1 weight 2.00000 + item host2 weight 5.00000 } # rules diff --git a/src/test/cli/crushtool/need_tree_order.crush b/src/test/cli/crushtool/need_tree_order.crush index 4625edd72bb..b0a7df71a9c 100644 --- a/src/test/cli/crushtool/need_tree_order.crush +++ b/src/test/cli/crushtool/need_tree_order.crush @@ -14,40 +14,40 @@ type 3 root # buckets host host0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device1 weight 1.000 + item device1 weight 1.00000 } host host2 { id -5 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device2 weight 1.000 + item device2 weight 1.00000 } rack rack0 { id -3 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 1.000 - item host2 weight 1.000 + item host0 weight 1.00000 + item host1 weight 1.00000 + item host2 weight 1.00000 } root root { id -4 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item rack0 weight 4.000 + item rack0 weight 4.00000 } # rules diff --git a/src/test/cli/crushtool/rules.t b/src/test/cli/crushtool/rules.t index e90ddbcf7cb..6e59e57c573 100644 --- a/src/test/cli/crushtool/rules.t +++ b/src/test/cli/crushtool/rules.t @@ -20,33 +20,33 @@ \tid -3\t\t# do not change unnecessarily (esc) \tid -4 class ssd\t\t# do not change unnecessarily (esc) \tid -7 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.0 weight 1.000 (esc) - \titem osd.1 weight 1.000 (esc) - \titem osd.2 weight 1.000 (esc) + \titem osd.0 weight 1.00000 (esc) + \titem osd.1 weight 1.00000 (esc) + \titem osd.2 weight 1.00000 (esc) } host bar { \tid -2\t\t# do not change unnecessarily (esc) \tid -5 class ssd\t\t# do not change unnecessarily (esc) \tid -8 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.3 weight 1.000 (esc) - \titem osd.4 weight 1.000 (esc) - \titem osd.5 weight 1.000 (esc) + \titem osd.3 weight 1.00000 (esc) + \titem osd.4 weight 1.00000 (esc) + \titem osd.5 weight 1.00000 (esc) } root default { \tid -1\t\t# do not change unnecessarily (esc) \tid -6 class ssd\t\t# do not change unnecessarily (esc) \tid -9 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 6.000 (esc) + \t# weight 6.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem foo weight 3.000 (esc) - \titem bar weight 3.000 (esc) + \titem foo weight 3.00000 (esc) + \titem bar weight 3.00000 (esc) } # rules @@ -102,33 +102,33 @@ \tid -3\t\t# do not change unnecessarily (esc) \tid -4 class ssd\t\t# do not change unnecessarily (esc) \tid -7 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.0 weight 1.000 (esc) - \titem osd.1 weight 1.000 (esc) - \titem osd.2 weight 1.000 (esc) + \titem osd.0 weight 1.00000 (esc) + \titem osd.1 weight 1.00000 (esc) + \titem osd.2 weight 1.00000 (esc) } host bar { \tid -2\t\t# do not change unnecessarily (esc) \tid -5 class ssd\t\t# do not change unnecessarily (esc) \tid -8 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.3 weight 1.000 (esc) - \titem osd.4 weight 1.000 (esc) - \titem osd.5 weight 1.000 (esc) + \titem osd.3 weight 1.00000 (esc) + \titem osd.4 weight 1.00000 (esc) + \titem osd.5 weight 1.00000 (esc) } root default { \tid -1\t\t# do not change unnecessarily (esc) \tid -6 class ssd\t\t# do not change unnecessarily (esc) \tid -9 class hdd\t\t# do not change unnecessarily (esc) - \t# weight 6.000 (esc) + \t# weight 6.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem foo weight 3.000 (esc) - \titem bar weight 3.000 (esc) + \titem foo weight 3.00000 (esc) + \titem bar weight 3.00000 (esc) } # rules diff --git a/src/test/cli/crushtool/rules.txt b/src/test/cli/crushtool/rules.txt index c7acf52e56e..a8be9e95867 100644 --- a/src/test/cli/crushtool/rules.txt +++ b/src/test/cli/crushtool/rules.txt @@ -18,26 +18,26 @@ host foo { id -3 alg straw2 hash 0 - item osd.0 weight 1.0 - item osd.1 weight 1.0 - item osd.2 weight 1.0 + item osd.0 weight 1.00000 + item osd.1 weight 1.00000 + item osd.2 weight 1.00000 } host bar { id -2 alg straw2 hash 0 - item osd.3 weight 1.0 - item osd.4 weight 1.0 - item osd.5 weight 1.0 + item osd.3 weight 1.00000 + item osd.4 weight 1.00000 + item osd.5 weight 1.00000 } root default { id -1 alg straw2 hash 0 - item foo weight 3.0 - item bar weight 3.0 + item foo weight 3.00000 + item bar weight 3.00000 } # rules diff --git a/src/test/cli/crushtool/set-choose.crushmap.txt b/src/test/cli/crushtool/set-choose.crushmap.txt index 8530436c026..f9f85c24548 100644 --- a/src/test/cli/crushtool/set-choose.crushmap.txt +++ b/src/test/cli/crushtool/set-choose.crushmap.txt @@ -24,46 +24,46 @@ type 3 root # buckets host host0 { id -1 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 } host host1 { id -2 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item device3 weight 1.000 - item device4 weight 1.000 - item device5 weight 1.000 + item device3 weight 1.00000 + item device4 weight 1.00000 + item device5 weight 1.00000 } host host2 { id -3 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item device6 weight 1.000 - item device7 weight 1.000 - item device8 weight 1.000 + item device6 weight 1.00000 + item device7 weight 1.00000 + item device8 weight 1.00000 } rack rack0 { id -4 # do not change unnecessarily - # weight 9.000 + # weight 9.00000 alg straw hash 0 # rjenkins1 - item host0 weight 3.000 - item host1 weight 3.000 - item host2 weight 3.000 + item host0 weight 3.00000 + item host1 weight 3.00000 + item host2 weight 3.00000 } root root0 { id -5 # do not change unnecessarily - # weight 9.000 + # weight 9.00000 alg straw hash 0 # rjenkins1 - item rack0 weight 9.000 + item rack0 weight 9.00000 } # rules diff --git a/src/test/cli/crushtool/show-choose-tries.txt b/src/test/cli/crushtool/show-choose-tries.txt index 919ff3e4c79..7826fec36d9 100644 --- a/src/test/cli/crushtool/show-choose-tries.txt +++ b/src/test/cli/crushtool/show-choose-tries.txt @@ -16,12 +16,12 @@ type 1 root # buckets root root { id -1 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 } rule first_ruleset { diff --git a/src/test/cli/crushtool/simple.template.adj.one b/src/test/cli/crushtool/simple.template.adj.one index aa16bbdedc3..ff268e13f26 100644 --- a/src/test/cli/crushtool/simple.template.adj.one +++ b/src/test/cli/crushtool/simple.template.adj.one @@ -11,17 +11,17 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 + item host0 weight 1.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.adj.three b/src/test/cli/crushtool/simple.template.adj.three index 2532e88a4c1..eaadca595ca 100644 --- a/src/test/cli/crushtool/simple.template.adj.three +++ b/src/test/cli/crushtool/simple.template.adj.three @@ -11,25 +11,25 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item device0 weight 3.000 + item device0 weight 3.00000 } host fake { id -3 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item device0 weight 2.000 + item device0 weight 2.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 5.000 + # weight 5.00000 alg straw hash 0 # rjenkins1 - item host0 weight 3.000 - item fake weight 2.000 + item host0 weight 3.00000 + item fake weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.adj.two b/src/test/cli/crushtool/simple.template.adj.two index 7c911c45f31..15734891c63 100644 --- a/src/test/cli/crushtool/simple.template.adj.two +++ b/src/test/cli/crushtool/simple.template.adj.two @@ -11,25 +11,25 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host fake { id -3 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item device0 weight 2.000 + item device0 weight 2.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item fake weight 2.000 + item host0 weight 1.00000 + item fake weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.five b/src/test/cli/crushtool/simple.template.five index 6f2c5f43f8e..7d9c8842be3 100644 --- a/src/test/cli/crushtool/simple.template.five +++ b/src/test/cli/crushtool/simple.template.five @@ -12,25 +12,25 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { id -3 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item osd1 weight 2.000 + item osd1 weight 2.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 2.000 + item host0 weight 1.00000 + item host1 weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.four b/src/test/cli/crushtool/simple.template.four index 31dcecdca4a..94c243de76d 100644 --- a/src/test/cli/crushtool/simple.template.four +++ b/src/test/cli/crushtool/simple.template.four @@ -11,17 +11,17 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 + item host0 weight 1.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.multitree b/src/test/cli/crushtool/simple.template.multitree index e2967a1c66f..6cf1b217792 100644 --- a/src/test/cli/crushtool/simple.template.multitree +++ b/src/test/cli/crushtool/simple.template.multitree @@ -11,31 +11,31 @@ type 2 cluster # buckets host host0 { - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item osd1 weight 2.000 + item osd1 weight 2.00000 } cluster cluster0 { - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 2.000 + item host0 weight 1.00000 + item host1 weight 2.00000 } cluster cluster1 { - # weight 3.000 + # weight 3.00000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 2.000 + item host0 weight 1.00000 + item host1 weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.multitree.reweighted b/src/test/cli/crushtool/simple.template.multitree.reweighted index b337d28f7c6..bfffbc6677b 100644 --- a/src/test/cli/crushtool/simple.template.multitree.reweighted +++ b/src/test/cli/crushtool/simple.template.multitree.reweighted @@ -12,33 +12,33 @@ type 2 cluster # buckets host host0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } host host1 { id -2 # do not change unnecessarily - # weight 2.500 + # weight 2.50000 alg straw hash 0 # rjenkins1 - item osd1 weight 2.500 + item osd1 weight 2.50000 } cluster cluster0 { id -3 # do not change unnecessarily - # weight 3.500 + # weight 3.50000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 2.500 + item host0 weight 1.00000 + item host1 weight 2.50000 } cluster cluster1 { id -4 # do not change unnecessarily - # weight 3.500 + # weight 3.50000 alg straw hash 0 # rjenkins1 - item host0 weight 1.000 - item host1 weight 2.500 + item host0 weight 1.00000 + item host1 weight 2.50000 } # rules diff --git a/src/test/cli/crushtool/simple.template.one b/src/test/cli/crushtool/simple.template.one index 9a3aee7349d..22acd02d2b4 100644 --- a/src/test/cli/crushtool/simple.template.one +++ b/src/test/cli/crushtool/simple.template.one @@ -12,18 +12,18 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item host0 weight 2.000 + item host0 weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.three b/src/test/cli/crushtool/simple.template.three index 9a3aee7349d..22acd02d2b4 100644 --- a/src/test/cli/crushtool/simple.template.three +++ b/src/test/cli/crushtool/simple.template.three @@ -12,18 +12,18 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item host0 weight 2.000 + item host0 weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/simple.template.two b/src/test/cli/crushtool/simple.template.two index 099ff70c1f2..4dcb1505d85 100644 --- a/src/test/cli/crushtool/simple.template.two +++ b/src/test/cli/crushtool/simple.template.two @@ -12,18 +12,18 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 2.000 + # weight 2.00000 alg straw hash 0 # rjenkins1 - item host0 weight 2.000 + item host0 weight 2.00000 } # rules diff --git a/src/test/cli/crushtool/straw2.txt b/src/test/cli/crushtool/straw2.txt index 0531c7ad197..65755e4d14e 100644 --- a/src/test/cli/crushtool/straw2.txt +++ b/src/test/cli/crushtool/straw2.txt @@ -16,17 +16,17 @@ type 2 default # buckets host host0 { id -1 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw2 hash 0 # rjenkins1 - item device0 weight 1.000 + item device0 weight 1.00000 } default default { id -2 # do not change unnecessarily - # weight 1.000 + # weight 1.00000 alg straw2 hash 0 # rjenkins1 - item host0 weight 1.000 + item host0 weight 1.00000 } # rules diff --git a/src/test/cli/crushtool/test-map-firstn-indep.txt b/src/test/cli/crushtool/test-map-firstn-indep.txt index 4534eab27b6..8fd2ea9eced 100644 --- a/src/test/cli/crushtool/test-map-firstn-indep.txt +++ b/src/test/cli/crushtool/test-map-firstn-indep.txt @@ -115,306 +115,306 @@ type 3 default # buckets host host0 { id -1 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device0 weight 1.000 - item device1 weight 1.000 - item device2 weight 1.000 - item device3 weight 1.000 + item device0 weight 1.00000 + item device1 weight 1.00000 + item device2 weight 1.00000 + item device3 weight 1.00000 } host host1 { id -2 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device4 weight 1.000 - item device5 weight 1.000 - item device6 weight 1.000 - item device7 weight 1.000 + item device4 weight 1.00000 + item device5 weight 1.00000 + item device6 weight 1.00000 + item device7 weight 1.00000 } host host2 { id -3 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device8 weight 1.000 - item device9 weight 1.000 - item device10 weight 1.000 - item device11 weight 1.000 + item device8 weight 1.00000 + item device9 weight 1.00000 + item device10 weight 1.00000 + item device11 weight 1.00000 } host host3 { id -4 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device12 weight 1.000 - item device13 weight 1.000 - item device14 weight 1.000 - item device15 weight 1.000 + item device12 weight 1.00000 + item device13 weight 1.00000 + item device14 weight 1.00000 + item device15 weight 1.00000 } host host4 { id -5 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device16 weight 1.000 - item device17 weight 1.000 - item device18 weight 1.000 - item device19 weight 1.000 + item device16 weight 1.00000 + item device17 weight 1.00000 + item device18 weight 1.00000 + item device19 weight 1.00000 } host host5 { id -6 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device20 weight 1.000 - item device21 weight 1.000 - item device22 weight 1.000 - item device23 weight 1.000 + item device20 weight 1.00000 + item device21 weight 1.00000 + item device22 weight 1.00000 + item device23 weight 1.00000 } host host6 { id -7 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device24 weight 1.000 - item device25 weight 1.000 - item device26 weight 1.000 - item device27 weight 1.000 + item device24 weight 1.00000 + item device25 weight 1.00000 + item device26 weight 1.00000 + item device27 weight 1.00000 } host host7 { id -8 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device28 weight 1.000 - item device29 weight 1.000 - item device30 weight 1.000 - item device31 weight 1.000 + item device28 weight 1.00000 + item device29 weight 1.00000 + item device30 weight 1.00000 + item device31 weight 1.00000 } host host8 { id -9 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device32 weight 1.000 - item device33 weight 1.000 - item device34 weight 1.000 - item device35 weight 1.000 + item device32 weight 1.00000 + item device33 weight 1.00000 + item device34 weight 1.00000 + item device35 weight 1.00000 } host host9 { id -10 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device36 weight 1.000 - item device37 weight 1.000 - item device38 weight 1.000 - item device39 weight 1.000 + item device36 weight 1.00000 + item device37 weight 1.00000 + item device38 weight 1.00000 + item device39 weight 1.00000 } host host10 { id -11 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device40 weight 1.000 - item device41 weight 1.000 - item device42 weight 1.000 - item device43 weight 1.000 + item device40 weight 1.00000 + item device41 weight 1.00000 + item device42 weight 1.00000 + item device43 weight 1.00000 } host host11 { id -12 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device44 weight 1.000 - item device45 weight 1.000 - item device46 weight 1.000 - item device47 weight 1.000 + item device44 weight 1.00000 + item device45 weight 1.00000 + item device46 weight 1.00000 + item device47 weight 1.00000 } host host12 { id -13 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device48 weight 1.000 - item device49 weight 1.000 - item device50 weight 1.000 - item device51 weight 1.000 + item device48 weight 1.00000 + item device49 weight 1.00000 + item device50 weight 1.00000 + item device51 weight 1.00000 } host host13 { id -14 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device52 weight 1.000 - item device53 weight 1.000 - item device54 weight 1.000 - item device55 weight 1.000 + item device52 weight 1.00000 + item device53 weight 1.00000 + item device54 weight 1.00000 + item device55 weight 1.00000 } host host14 { id -15 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device56 weight 1.000 - item device57 weight 1.000 - item device58 weight 1.000 - item device59 weight 1.000 + item device56 weight 1.00000 + item device57 weight 1.00000 + item device58 weight 1.00000 + item device59 weight 1.00000 } host host15 { id -16 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device60 weight 1.000 - item device61 weight 1.000 - item device62 weight 1.000 - item device63 weight 1.000 + item device60 weight 1.00000 + item device61 weight 1.00000 + item device62 weight 1.00000 + item device63 weight 1.00000 } host host16 { id -17 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device64 weight 1.000 - item device65 weight 1.000 - item device66 weight 1.000 - item device67 weight 1.000 + item device64 weight 1.00000 + item device65 weight 1.00000 + item device66 weight 1.00000 + item device67 weight 1.00000 } host host17 { id -18 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device68 weight 1.000 - item device69 weight 1.000 - item device70 weight 1.000 - item device71 weight 1.000 + item device68 weight 1.00000 + item device69 weight 1.00000 + item device70 weight 1.00000 + item device71 weight 1.00000 } host host18 { id -19 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device72 weight 1.000 - item device73 weight 1.000 - item device74 weight 1.000 - item device75 weight 1.000 + item device72 weight 1.00000 + item device73 weight 1.00000 + item device74 weight 1.00000 + item device75 weight 1.00000 } host host19 { id -20 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device76 weight 1.000 - item device77 weight 1.000 - item device78 weight 1.000 - item device79 weight 1.000 + item device76 weight 1.00000 + item device77 weight 1.00000 + item device78 weight 1.00000 + item device79 weight 1.00000 } host host20 { id -21 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device80 weight 1.000 - item device81 weight 1.000 - item device82 weight 1.000 - item device83 weight 1.000 + item device80 weight 1.00000 + item device81 weight 1.00000 + item device82 weight 1.00000 + item device83 weight 1.00000 } host host21 { id -22 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device84 weight 1.000 - item device85 weight 1.000 - item device86 weight 1.000 - item device87 weight 1.000 + item device84 weight 1.00000 + item device85 weight 1.00000 + item device86 weight 1.00000 + item device87 weight 1.00000 } host host22 { id -23 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device88 weight 1.000 - item device89 weight 1.000 - item device90 weight 1.000 - item device91 weight 1.000 + item device88 weight 1.00000 + item device89 weight 1.00000 + item device90 weight 1.00000 + item device91 weight 1.00000 } host host23 { id -24 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device92 weight 1.000 - item device93 weight 1.000 - item device94 weight 1.000 - item device95 weight 1.000 + item device92 weight 1.00000 + item device93 weight 1.00000 + item device94 weight 1.00000 + item device95 weight 1.00000 } host host24 { id -25 # do not change unnecessarily - # weight 4.000 + # weight 4.00000 alg straw hash 0 # rjenkins1 - item device96 weight 1.000 - item device97 weight 1.000 - item device98 weight 1.000 - item device99 weight 1.000 + item device96 weight 1.00000 + item device97 weight 1.00000 + item device98 weight 1.00000 + item device99 weight 1.00000 } rack rack0 { id -26 # do not change unnecessarily - # weight 40.000 + # weight 40.00000 alg straw hash 0 # rjenkins1 - item host0 weight 4.000 - item host1 weight 4.000 - item host2 weight 4.000 - item host3 weight 4.000 - item host4 weight 4.000 - item host5 weight 4.000 - item host6 weight 4.000 - item host7 weight 4.000 - item host8 weight 4.000 - item host9 weight 4.000 + item host0 weight 4.00000 + item host1 weight 4.00000 + item host2 weight 4.00000 + item host3 weight 4.00000 + item host4 weight 4.00000 + item host5 weight 4.00000 + item host6 weight 4.00000 + item host7 weight 4.00000 + item host8 weight 4.00000 + item host9 weight 4.00000 } rack rack1 { id -27 # do not change unnecessarily - # weight 40.000 + # weight 40.00000 alg straw hash 0 # rjenkins1 - item host10 weight 4.000 - item host11 weight 4.000 - item host12 weight 4.000 - item host13 weight 4.000 - item host14 weight 4.000 - item host15 weight 4.000 - item host16 weight 4.000 - item host17 weight 4.000 - item host18 weight 4.000 - item host19 weight 4.000 + item host10 weight 4.00000 + item host11 weight 4.00000 + item host12 weight 4.00000 + item host13 weight 4.00000 + item host14 weight 4.00000 + item host15 weight 4.00000 + item host16 weight 4.00000 + item host17 weight 4.00000 + item host18 weight 4.00000 + item host19 weight 4.00000 } rack rack2 { id -28 # do not change unnecessarily - # weight 20.000 + # weight 20.00000 alg straw hash 0 # rjenkins1 - item host20 weight 4.000 - item host21 weight 4.000 - item host22 weight 4.000 - item host23 weight 4.000 - item host24 weight 4.000 + item host20 weight 4.00000 + item host21 weight 4.00000 + item host22 weight 4.00000 + item host23 weight 4.00000 + item host24 weight 4.00000 } default root { id -31 # do not change unnecessarily - # weight 100.000 + # weight 100.00000 alg straw hash 0 # rjenkins1 - item rack1 weight 40.000 - item rack1 weight 40.000 - item rack2 weight 20.000 + item rack1 weight 40.00000 + item rack1 weight 40.00000 + item rack2 weight 20.00000 } # rules diff --git a/src/test/cli/crushtool/tree.template.final b/src/test/cli/crushtool/tree.template.final index 82659058ee0..3c0680ac8d1 100644 --- a/src/test/cli/crushtool/tree.template.final +++ b/src/test/cli/crushtool/tree.template.final @@ -18,24 +18,24 @@ type 2 cluster # buckets host host0 { id -2 # do not change unnecessarily - # weight 8.000 + # weight 8.00000 alg tree # do not change pos for existing items unnecessarily hash 0 # rjenkins1 - item device0 weight 1.000 pos 0 - item device1 weight 1.000 pos 1 - item device2 weight 1.000 pos 2 - item device3 weight 1.000 pos 3 - item device4 weight 1.000 pos 4 - item device5 weight 1.000 pos 5 - item device6 weight 1.000 pos 6 - item device7 weight 1.000 pos 7 + item device0 weight 1.00000 pos 0 + item device1 weight 1.00000 pos 1 + item device2 weight 1.00000 pos 2 + item device3 weight 1.00000 pos 3 + item device4 weight 1.00000 pos 4 + item device5 weight 1.00000 pos 5 + item device6 weight 1.00000 pos 6 + item device7 weight 1.00000 pos 7 } cluster cluster0 { id -1 # do not change unnecessarily - # weight 8.000 + # weight 8.00000 alg tree # do not change pos for existing items unnecessarily hash 0 # rjenkins1 - item host0 weight 8.000 pos 0 + item host0 weight 8.00000 pos 0 } # rules diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t index 366e62185b4..08f0836d30a 100644 --- a/src/test/cli/osdmaptool/create-print.t +++ b/src/test/cli/osdmaptool/create-print.t @@ -38,26 +38,26 @@ # buckets host localhost { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.0 weight 1.000 (esc) - \titem osd.1 weight 1.000 (esc) - \titem osd.2 weight 1.000 (esc) + \titem osd.0 weight 1.00000 (esc) + \titem osd.1 weight 1.00000 (esc) + \titem osd.2 weight 1.00000 (esc) } rack localrack { \tid -3\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem localhost weight 3.000 (esc) + \titem localhost weight 3.00000 (esc) } root default { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 3.000 (esc) + \t# weight 3.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem localrack weight 3.000 (esc) + \titem localrack weight 3.00000 (esc) } # rules diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t index 2fe5c4927d2..34bd8257996 100644 --- a/src/test/cli/osdmaptool/create-racks.t +++ b/src/test/cli/osdmaptool/create-racks.t @@ -272,499 +272,499 @@ # buckets host cephstore5522 { \tid -2\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.1 weight 1.000 (esc) - \titem osd.2 weight 1.000 (esc) - \titem osd.3 weight 1.000 (esc) - \titem osd.4 weight 1.000 (esc) - \titem osd.5 weight 1.000 (esc) - \titem osd.6 weight 1.000 (esc) - \titem osd.7 weight 1.000 (esc) + \titem osd.1 weight 1.00000 (esc) + \titem osd.2 weight 1.00000 (esc) + \titem osd.3 weight 1.00000 (esc) + \titem osd.4 weight 1.00000 (esc) + \titem osd.5 weight 1.00000 (esc) + \titem osd.6 weight 1.00000 (esc) + \titem osd.7 weight 1.00000 (esc) } host cephstore5523 { \tid -4\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.10 weight 1.000 (esc) - \titem osd.11 weight 1.000 (esc) - \titem osd.12 weight 1.000 (esc) - \titem osd.13 weight 1.000 (esc) - \titem osd.14 weight 1.000 (esc) - \titem osd.8 weight 1.000 (esc) - \titem osd.9 weight 1.000 (esc) + \titem osd.10 weight 1.00000 (esc) + \titem osd.11 weight 1.00000 (esc) + \titem osd.12 weight 1.00000 (esc) + \titem osd.13 weight 1.00000 (esc) + \titem osd.14 weight 1.00000 (esc) + \titem osd.8 weight 1.00000 (esc) + \titem osd.9 weight 1.00000 (esc) } host cephstore6238 { \tid -8\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.113 weight 1.000 (esc) - \titem osd.114 weight 1.000 (esc) - \titem osd.115 weight 1.000 (esc) - \titem osd.116 weight 1.000 (esc) - \titem osd.117 weight 1.000 (esc) - \titem osd.118 weight 1.000 (esc) - \titem osd.119 weight 1.000 (esc) + \titem osd.113 weight 1.00000 (esc) + \titem osd.114 weight 1.00000 (esc) + \titem osd.115 weight 1.00000 (esc) + \titem osd.116 weight 1.00000 (esc) + \titem osd.117 weight 1.00000 (esc) + \titem osd.118 weight 1.00000 (esc) + \titem osd.119 weight 1.00000 (esc) } host cephstore6240 { \tid -10\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.127 weight 1.000 (esc) - \titem osd.128 weight 1.000 (esc) - \titem osd.129 weight 1.000 (esc) - \titem osd.130 weight 1.000 (esc) - \titem osd.131 weight 1.000 (esc) - \titem osd.132 weight 1.000 (esc) - \titem osd.133 weight 1.000 (esc) + \titem osd.127 weight 1.00000 (esc) + \titem osd.128 weight 1.00000 (esc) + \titem osd.129 weight 1.00000 (esc) + \titem osd.130 weight 1.00000 (esc) + \titem osd.131 weight 1.00000 (esc) + \titem osd.132 weight 1.00000 (esc) + \titem osd.133 weight 1.00000 (esc) } host cephstore6242 { \tid -12\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.141 weight 1.000 (esc) - \titem osd.142 weight 1.000 (esc) - \titem osd.143 weight 1.000 (esc) - \titem osd.144 weight 1.000 (esc) - \titem osd.145 weight 1.000 (esc) - \titem osd.146 weight 1.000 (esc) - \titem osd.147 weight 1.000 (esc) + \titem osd.141 weight 1.00000 (esc) + \titem osd.142 weight 1.00000 (esc) + \titem osd.143 weight 1.00000 (esc) + \titem osd.144 weight 1.00000 (esc) + \titem osd.145 weight 1.00000 (esc) + \titem osd.146 weight 1.00000 (esc) + \titem osd.147 weight 1.00000 (esc) } host cephstore5524 { \tid -14\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.15 weight 1.000 (esc) - \titem osd.16 weight 1.000 (esc) - \titem osd.17 weight 1.000 (esc) - \titem osd.18 weight 1.000 (esc) - \titem osd.19 weight 1.000 (esc) - \titem osd.20 weight 1.000 (esc) - \titem osd.21 weight 1.000 (esc) + \titem osd.15 weight 1.00000 (esc) + \titem osd.16 weight 1.00000 (esc) + \titem osd.17 weight 1.00000 (esc) + \titem osd.18 weight 1.00000 (esc) + \titem osd.19 weight 1.00000 (esc) + \titem osd.20 weight 1.00000 (esc) + \titem osd.21 weight 1.00000 (esc) } host cephstore6244 { \tid -15\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.155 weight 1.000 (esc) - \titem osd.156 weight 1.000 (esc) - \titem osd.157 weight 1.000 (esc) - \titem osd.158 weight 1.000 (esc) - \titem osd.159 weight 1.000 (esc) - \titem osd.160 weight 1.000 (esc) - \titem osd.161 weight 1.000 (esc) + \titem osd.155 weight 1.00000 (esc) + \titem osd.156 weight 1.00000 (esc) + \titem osd.157 weight 1.00000 (esc) + \titem osd.158 weight 1.00000 (esc) + \titem osd.159 weight 1.00000 (esc) + \titem osd.160 weight 1.00000 (esc) + \titem osd.161 weight 1.00000 (esc) } host cephstore6246 { \tid -17\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.169 weight 1.000 (esc) - \titem osd.170 weight 1.000 (esc) - \titem osd.171 weight 1.000 (esc) - \titem osd.172 weight 1.000 (esc) - \titem osd.173 weight 1.000 (esc) - \titem osd.174 weight 1.000 (esc) - \titem osd.175 weight 1.000 (esc) + \titem osd.169 weight 1.00000 (esc) + \titem osd.170 weight 1.00000 (esc) + \titem osd.171 weight 1.00000 (esc) + \titem osd.172 weight 1.00000 (esc) + \titem osd.173 weight 1.00000 (esc) + \titem osd.174 weight 1.00000 (esc) + \titem osd.175 weight 1.00000 (esc) } host cephstore6337 { \tid -19\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.183 weight 1.000 (esc) - \titem osd.184 weight 1.000 (esc) - \titem osd.185 weight 1.000 (esc) - \titem osd.186 weight 1.000 (esc) - \titem osd.187 weight 1.000 (esc) - \titem osd.188 weight 1.000 (esc) - \titem osd.189 weight 1.000 (esc) + \titem osd.183 weight 1.00000 (esc) + \titem osd.184 weight 1.00000 (esc) + \titem osd.185 weight 1.00000 (esc) + \titem osd.186 weight 1.00000 (esc) + \titem osd.187 weight 1.00000 (esc) + \titem osd.188 weight 1.00000 (esc) + \titem osd.189 weight 1.00000 (esc) } host cephstore6341 { \tid -23\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.211 weight 1.000 (esc) - \titem osd.212 weight 1.000 (esc) - \titem osd.213 weight 1.000 (esc) - \titem osd.214 weight 1.000 (esc) - \titem osd.215 weight 1.000 (esc) - \titem osd.216 weight 1.000 (esc) - \titem osd.217 weight 1.000 (esc) + \titem osd.211 weight 1.00000 (esc) + \titem osd.212 weight 1.00000 (esc) + \titem osd.213 weight 1.00000 (esc) + \titem osd.214 weight 1.00000 (esc) + \titem osd.215 weight 1.00000 (esc) + \titem osd.216 weight 1.00000 (esc) + \titem osd.217 weight 1.00000 (esc) } host cephstore6342 { \tid -24\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.218 weight 1.000 (esc) - \titem osd.219 weight 1.000 (esc) - \titem osd.220 weight 1.000 (esc) - \titem osd.221 weight 1.000 (esc) - \titem osd.222 weight 1.000 (esc) - \titem osd.223 weight 1.000 (esc) - \titem osd.224 weight 1.000 (esc) + \titem osd.218 weight 1.00000 (esc) + \titem osd.219 weight 1.00000 (esc) + \titem osd.220 weight 1.00000 (esc) + \titem osd.221 weight 1.00000 (esc) + \titem osd.222 weight 1.00000 (esc) + \titem osd.223 weight 1.00000 (esc) + \titem osd.224 weight 1.00000 (esc) } host cephstore5525 { \tid -25\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.22 weight 1.000 (esc) - \titem osd.23 weight 1.000 (esc) - \titem osd.24 weight 1.000 (esc) - \titem osd.25 weight 1.000 (esc) - \titem osd.26 weight 1.000 (esc) - \titem osd.27 weight 1.000 (esc) - \titem osd.28 weight 1.000 (esc) + \titem osd.22 weight 1.00000 (esc) + \titem osd.23 weight 1.00000 (esc) + \titem osd.24 weight 1.00000 (esc) + \titem osd.25 weight 1.00000 (esc) + \titem osd.26 weight 1.00000 (esc) + \titem osd.27 weight 1.00000 (esc) + \titem osd.28 weight 1.00000 (esc) } host cephstore6345 { \tid -27\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.232 weight 1.000 (esc) - \titem osd.233 weight 1.000 (esc) - \titem osd.234 weight 1.000 (esc) - \titem osd.235 weight 1.000 (esc) - \titem osd.236 weight 1.000 (esc) - \titem osd.237 weight 1.000 (esc) - \titem osd.238 weight 1.000 (esc) + \titem osd.232 weight 1.00000 (esc) + \titem osd.233 weight 1.00000 (esc) + \titem osd.234 weight 1.00000 (esc) + \titem osd.235 weight 1.00000 (esc) + \titem osd.236 weight 1.00000 (esc) + \titem osd.237 weight 1.00000 (esc) + \titem osd.238 weight 1.00000 (esc) } host cephstore5526 { \tid -28\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.29 weight 1.000 (esc) - \titem osd.30 weight 1.000 (esc) - \titem osd.31 weight 1.000 (esc) - \titem osd.32 weight 1.000 (esc) - \titem osd.33 weight 1.000 (esc) - \titem osd.34 weight 1.000 (esc) - \titem osd.35 weight 1.000 (esc) + \titem osd.29 weight 1.00000 (esc) + \titem osd.30 weight 1.00000 (esc) + \titem osd.31 weight 1.00000 (esc) + \titem osd.32 weight 1.00000 (esc) + \titem osd.33 weight 1.00000 (esc) + \titem osd.34 weight 1.00000 (esc) + \titem osd.35 weight 1.00000 (esc) } host cephstore5527 { \tid -29\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.36 weight 1.000 (esc) - \titem osd.37 weight 1.000 (esc) - \titem osd.38 weight 1.000 (esc) - \titem osd.39 weight 1.000 (esc) - \titem osd.40 weight 1.000 (esc) - \titem osd.41 weight 1.000 (esc) - \titem osd.42 weight 1.000 (esc) + \titem osd.36 weight 1.00000 (esc) + \titem osd.37 weight 1.00000 (esc) + \titem osd.38 weight 1.00000 (esc) + \titem osd.39 weight 1.00000 (esc) + \titem osd.40 weight 1.00000 (esc) + \titem osd.41 weight 1.00000 (esc) + \titem osd.42 weight 1.00000 (esc) } host cephstore5529 { \tid -30\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.43 weight 1.000 (esc) - \titem osd.44 weight 1.000 (esc) - \titem osd.45 weight 1.000 (esc) - \titem osd.46 weight 1.000 (esc) - \titem osd.47 weight 1.000 (esc) - \titem osd.48 weight 1.000 (esc) - \titem osd.49 weight 1.000 (esc) + \titem osd.43 weight 1.00000 (esc) + \titem osd.44 weight 1.00000 (esc) + \titem osd.45 weight 1.00000 (esc) + \titem osd.46 weight 1.00000 (esc) + \titem osd.47 weight 1.00000 (esc) + \titem osd.48 weight 1.00000 (esc) + \titem osd.49 weight 1.00000 (esc) } host cephstore5530 { \tid -31\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.50 weight 1.000 (esc) - \titem osd.51 weight 1.000 (esc) - \titem osd.52 weight 1.000 (esc) - \titem osd.53 weight 1.000 (esc) - \titem osd.54 weight 1.000 (esc) - \titem osd.55 weight 1.000 (esc) - \titem osd.56 weight 1.000 (esc) + \titem osd.50 weight 1.00000 (esc) + \titem osd.51 weight 1.00000 (esc) + \titem osd.52 weight 1.00000 (esc) + \titem osd.53 weight 1.00000 (esc) + \titem osd.54 weight 1.00000 (esc) + \titem osd.55 weight 1.00000 (esc) + \titem osd.56 weight 1.00000 (esc) } rack irv-n2 { \tid -3\t\t# do not change unnecessarily (esc) - \t# weight 119.000 (esc) - \talg straw2 (esc) - \thash 0\t# rjenkins1 (esc) - \titem cephstore5522 weight 7.000 (esc) - \titem cephstore5523 weight 7.000 (esc) - \titem cephstore6238 weight 7.000 (esc) - \titem cephstore6240 weight 7.000 (esc) - \titem cephstore6242 weight 7.000 (esc) - \titem cephstore5524 weight 7.000 (esc) - \titem cephstore6244 weight 7.000 (esc) - \titem cephstore6246 weight 7.000 (esc) - \titem cephstore6337 weight 7.000 (esc) - \titem cephstore6341 weight 7.000 (esc) - \titem cephstore6342 weight 7.000 (esc) - \titem cephstore5525 weight 7.000 (esc) - \titem cephstore6345 weight 7.000 (esc) - \titem cephstore5526 weight 7.000 (esc) - \titem cephstore5527 weight 7.000 (esc) - \titem cephstore5529 weight 7.000 (esc) - \titem cephstore5530 weight 7.000 (esc) + \t# weight 119.00000 (esc) + \talg straw2 (esc) + \thash 0\t# rjenkins1 (esc) + \titem cephstore5522 weight 7.00000 (esc) + \titem cephstore5523 weight 7.00000 (esc) + \titem cephstore6238 weight 7.00000 (esc) + \titem cephstore6240 weight 7.00000 (esc) + \titem cephstore6242 weight 7.00000 (esc) + \titem cephstore5524 weight 7.00000 (esc) + \titem cephstore6244 weight 7.00000 (esc) + \titem cephstore6246 weight 7.00000 (esc) + \titem cephstore6337 weight 7.00000 (esc) + \titem cephstore6341 weight 7.00000 (esc) + \titem cephstore6342 weight 7.00000 (esc) + \titem cephstore5525 weight 7.00000 (esc) + \titem cephstore6345 weight 7.00000 (esc) + \titem cephstore5526 weight 7.00000 (esc) + \titem cephstore5527 weight 7.00000 (esc) + \titem cephstore5529 weight 7.00000 (esc) + \titem cephstore5530 weight 7.00000 (esc) } host cephstore6236 { \tid -5\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.100 weight 1.000 (esc) - \titem osd.101 weight 1.000 (esc) - \titem osd.102 weight 1.000 (esc) - \titem osd.103 weight 1.000 (esc) - \titem osd.104 weight 1.000 (esc) - \titem osd.105 weight 1.000 (esc) - \titem osd.99 weight 1.000 (esc) + \titem osd.100 weight 1.00000 (esc) + \titem osd.101 weight 1.00000 (esc) + \titem osd.102 weight 1.00000 (esc) + \titem osd.103 weight 1.00000 (esc) + \titem osd.104 weight 1.00000 (esc) + \titem osd.105 weight 1.00000 (esc) + \titem osd.99 weight 1.00000 (esc) } host cephstore6237 { \tid -7\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.106 weight 1.000 (esc) - \titem osd.107 weight 1.000 (esc) - \titem osd.108 weight 1.000 (esc) - \titem osd.109 weight 1.000 (esc) - \titem osd.110 weight 1.000 (esc) - \titem osd.111 weight 1.000 (esc) - \titem osd.112 weight 1.000 (esc) + \titem osd.106 weight 1.00000 (esc) + \titem osd.107 weight 1.00000 (esc) + \titem osd.108 weight 1.00000 (esc) + \titem osd.109 weight 1.00000 (esc) + \titem osd.110 weight 1.00000 (esc) + \titem osd.111 weight 1.00000 (esc) + \titem osd.112 weight 1.00000 (esc) } host cephstore6239 { \tid -9\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.120 weight 1.000 (esc) - \titem osd.121 weight 1.000 (esc) - \titem osd.122 weight 1.000 (esc) - \titem osd.123 weight 1.000 (esc) - \titem osd.124 weight 1.000 (esc) - \titem osd.125 weight 1.000 (esc) - \titem osd.126 weight 1.000 (esc) + \titem osd.120 weight 1.00000 (esc) + \titem osd.121 weight 1.00000 (esc) + \titem osd.122 weight 1.00000 (esc) + \titem osd.123 weight 1.00000 (esc) + \titem osd.124 weight 1.00000 (esc) + \titem osd.125 weight 1.00000 (esc) + \titem osd.126 weight 1.00000 (esc) } host cephstore6241 { \tid -11\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.134 weight 1.000 (esc) - \titem osd.135 weight 1.000 (esc) - \titem osd.136 weight 1.000 (esc) - \titem osd.137 weight 1.000 (esc) - \titem osd.138 weight 1.000 (esc) - \titem osd.139 weight 1.000 (esc) - \titem osd.140 weight 1.000 (esc) + \titem osd.134 weight 1.00000 (esc) + \titem osd.135 weight 1.00000 (esc) + \titem osd.136 weight 1.00000 (esc) + \titem osd.137 weight 1.00000 (esc) + \titem osd.138 weight 1.00000 (esc) + \titem osd.139 weight 1.00000 (esc) + \titem osd.140 weight 1.00000 (esc) } host cephstore6243 { \tid -13\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.148 weight 1.000 (esc) - \titem osd.149 weight 1.000 (esc) - \titem osd.150 weight 1.000 (esc) - \titem osd.151 weight 1.000 (esc) - \titem osd.152 weight 1.000 (esc) - \titem osd.153 weight 1.000 (esc) - \titem osd.154 weight 1.000 (esc) + \titem osd.148 weight 1.00000 (esc) + \titem osd.149 weight 1.00000 (esc) + \titem osd.150 weight 1.00000 (esc) + \titem osd.151 weight 1.00000 (esc) + \titem osd.152 weight 1.00000 (esc) + \titem osd.153 weight 1.00000 (esc) + \titem osd.154 weight 1.00000 (esc) } host cephstore6245 { \tid -16\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.162 weight 1.000 (esc) - \titem osd.163 weight 1.000 (esc) - \titem osd.164 weight 1.000 (esc) - \titem osd.165 weight 1.000 (esc) - \titem osd.166 weight 1.000 (esc) - \titem osd.167 weight 1.000 (esc) - \titem osd.168 weight 1.000 (esc) + \titem osd.162 weight 1.00000 (esc) + \titem osd.163 weight 1.00000 (esc) + \titem osd.164 weight 1.00000 (esc) + \titem osd.165 weight 1.00000 (esc) + \titem osd.166 weight 1.00000 (esc) + \titem osd.167 weight 1.00000 (esc) + \titem osd.168 weight 1.00000 (esc) } host cephstore6336 { \tid -18\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.176 weight 1.000 (esc) - \titem osd.177 weight 1.000 (esc) - \titem osd.178 weight 1.000 (esc) - \titem osd.179 weight 1.000 (esc) - \titem osd.180 weight 1.000 (esc) - \titem osd.181 weight 1.000 (esc) - \titem osd.182 weight 1.000 (esc) + \titem osd.176 weight 1.00000 (esc) + \titem osd.177 weight 1.00000 (esc) + \titem osd.178 weight 1.00000 (esc) + \titem osd.179 weight 1.00000 (esc) + \titem osd.180 weight 1.00000 (esc) + \titem osd.181 weight 1.00000 (esc) + \titem osd.182 weight 1.00000 (esc) } host cephstore6338 { \tid -20\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.190 weight 1.000 (esc) - \titem osd.191 weight 1.000 (esc) - \titem osd.192 weight 1.000 (esc) - \titem osd.193 weight 1.000 (esc) - \titem osd.194 weight 1.000 (esc) - \titem osd.195 weight 1.000 (esc) - \titem osd.196 weight 1.000 (esc) + \titem osd.190 weight 1.00000 (esc) + \titem osd.191 weight 1.00000 (esc) + \titem osd.192 weight 1.00000 (esc) + \titem osd.193 weight 1.00000 (esc) + \titem osd.194 weight 1.00000 (esc) + \titem osd.195 weight 1.00000 (esc) + \titem osd.196 weight 1.00000 (esc) } host cephstore6339 { \tid -21\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.197 weight 1.000 (esc) - \titem osd.198 weight 1.000 (esc) - \titem osd.199 weight 1.000 (esc) - \titem osd.200 weight 1.000 (esc) - \titem osd.201 weight 1.000 (esc) - \titem osd.202 weight 1.000 (esc) - \titem osd.203 weight 1.000 (esc) + \titem osd.197 weight 1.00000 (esc) + \titem osd.198 weight 1.00000 (esc) + \titem osd.199 weight 1.00000 (esc) + \titem osd.200 weight 1.00000 (esc) + \titem osd.201 weight 1.00000 (esc) + \titem osd.202 weight 1.00000 (esc) + \titem osd.203 weight 1.00000 (esc) } host cephstore6340 { \tid -22\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.204 weight 1.000 (esc) - \titem osd.205 weight 1.000 (esc) - \titem osd.206 weight 1.000 (esc) - \titem osd.207 weight 1.000 (esc) - \titem osd.208 weight 1.000 (esc) - \titem osd.209 weight 1.000 (esc) - \titem osd.210 weight 1.000 (esc) + \titem osd.204 weight 1.00000 (esc) + \titem osd.205 weight 1.00000 (esc) + \titem osd.206 weight 1.00000 (esc) + \titem osd.207 weight 1.00000 (esc) + \titem osd.208 weight 1.00000 (esc) + \titem osd.209 weight 1.00000 (esc) + \titem osd.210 weight 1.00000 (esc) } host cephstore6343 { \tid -26\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.225 weight 1.000 (esc) - \titem osd.226 weight 1.000 (esc) - \titem osd.227 weight 1.000 (esc) - \titem osd.228 weight 1.000 (esc) - \titem osd.229 weight 1.000 (esc) - \titem osd.230 weight 1.000 (esc) - \titem osd.231 weight 1.000 (esc) + \titem osd.225 weight 1.00000 (esc) + \titem osd.226 weight 1.00000 (esc) + \titem osd.227 weight 1.00000 (esc) + \titem osd.228 weight 1.00000 (esc) + \titem osd.229 weight 1.00000 (esc) + \titem osd.230 weight 1.00000 (esc) + \titem osd.231 weight 1.00000 (esc) } host cephstore6230 { \tid -32\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.57 weight 1.000 (esc) - \titem osd.58 weight 1.000 (esc) - \titem osd.59 weight 1.000 (esc) - \titem osd.60 weight 1.000 (esc) - \titem osd.61 weight 1.000 (esc) - \titem osd.62 weight 1.000 (esc) - \titem osd.63 weight 1.000 (esc) + \titem osd.57 weight 1.00000 (esc) + \titem osd.58 weight 1.00000 (esc) + \titem osd.59 weight 1.00000 (esc) + \titem osd.60 weight 1.00000 (esc) + \titem osd.61 weight 1.00000 (esc) + \titem osd.62 weight 1.00000 (esc) + \titem osd.63 weight 1.00000 (esc) } host cephstore6231 { \tid -33\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.64 weight 1.000 (esc) - \titem osd.65 weight 1.000 (esc) - \titem osd.66 weight 1.000 (esc) - \titem osd.67 weight 1.000 (esc) - \titem osd.68 weight 1.000 (esc) - \titem osd.69 weight 1.000 (esc) - \titem osd.70 weight 1.000 (esc) + \titem osd.64 weight 1.00000 (esc) + \titem osd.65 weight 1.00000 (esc) + \titem osd.66 weight 1.00000 (esc) + \titem osd.67 weight 1.00000 (esc) + \titem osd.68 weight 1.00000 (esc) + \titem osd.69 weight 1.00000 (esc) + \titem osd.70 weight 1.00000 (esc) } host cephstore6232 { \tid -34\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.71 weight 1.000 (esc) - \titem osd.72 weight 1.000 (esc) - \titem osd.73 weight 1.000 (esc) - \titem osd.74 weight 1.000 (esc) - \titem osd.75 weight 1.000 (esc) - \titem osd.76 weight 1.000 (esc) - \titem osd.77 weight 1.000 (esc) + \titem osd.71 weight 1.00000 (esc) + \titem osd.72 weight 1.00000 (esc) + \titem osd.73 weight 1.00000 (esc) + \titem osd.74 weight 1.00000 (esc) + \titem osd.75 weight 1.00000 (esc) + \titem osd.76 weight 1.00000 (esc) + \titem osd.77 weight 1.00000 (esc) } host cephstore6233 { \tid -35\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.78 weight 1.000 (esc) - \titem osd.79 weight 1.000 (esc) - \titem osd.80 weight 1.000 (esc) - \titem osd.81 weight 1.000 (esc) - \titem osd.82 weight 1.000 (esc) - \titem osd.83 weight 1.000 (esc) - \titem osd.84 weight 1.000 (esc) + \titem osd.78 weight 1.00000 (esc) + \titem osd.79 weight 1.00000 (esc) + \titem osd.80 weight 1.00000 (esc) + \titem osd.81 weight 1.00000 (esc) + \titem osd.82 weight 1.00000 (esc) + \titem osd.83 weight 1.00000 (esc) + \titem osd.84 weight 1.00000 (esc) } host cephstore6234 { \tid -36\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.85 weight 1.000 (esc) - \titem osd.86 weight 1.000 (esc) - \titem osd.87 weight 1.000 (esc) - \titem osd.88 weight 1.000 (esc) - \titem osd.89 weight 1.000 (esc) - \titem osd.90 weight 1.000 (esc) - \titem osd.91 weight 1.000 (esc) + \titem osd.85 weight 1.00000 (esc) + \titem osd.86 weight 1.00000 (esc) + \titem osd.87 weight 1.00000 (esc) + \titem osd.88 weight 1.00000 (esc) + \titem osd.89 weight 1.00000 (esc) + \titem osd.90 weight 1.00000 (esc) + \titem osd.91 weight 1.00000 (esc) } host cephstore6235 { \tid -37\t\t# do not change unnecessarily (esc) - \t# weight 7.000 (esc) + \t# weight 7.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem osd.92 weight 1.000 (esc) - \titem osd.93 weight 1.000 (esc) - \titem osd.94 weight 1.000 (esc) - \titem osd.95 weight 1.000 (esc) - \titem osd.96 weight 1.000 (esc) - \titem osd.97 weight 1.000 (esc) - \titem osd.98 weight 1.000 (esc) + \titem osd.92 weight 1.00000 (esc) + \titem osd.93 weight 1.00000 (esc) + \titem osd.94 weight 1.00000 (esc) + \titem osd.95 weight 1.00000 (esc) + \titem osd.96 weight 1.00000 (esc) + \titem osd.97 weight 1.00000 (esc) + \titem osd.98 weight 1.00000 (esc) } rack irv-n1 { \tid -6\t\t# do not change unnecessarily (esc) - \t# weight 119.000 (esc) - \talg straw2 (esc) - \thash 0\t# rjenkins1 (esc) - \titem cephstore6236 weight 7.000 (esc) - \titem cephstore6237 weight 7.000 (esc) - \titem cephstore6239 weight 7.000 (esc) - \titem cephstore6241 weight 7.000 (esc) - \titem cephstore6243 weight 7.000 (esc) - \titem cephstore6245 weight 7.000 (esc) - \titem cephstore6336 weight 7.000 (esc) - \titem cephstore6338 weight 7.000 (esc) - \titem cephstore6339 weight 7.000 (esc) - \titem cephstore6340 weight 7.000 (esc) - \titem cephstore6343 weight 7.000 (esc) - \titem cephstore6230 weight 7.000 (esc) - \titem cephstore6231 weight 7.000 (esc) - \titem cephstore6232 weight 7.000 (esc) - \titem cephstore6233 weight 7.000 (esc) - \titem cephstore6234 weight 7.000 (esc) - \titem cephstore6235 weight 7.000 (esc) + \t# weight 119.00000 (esc) + \talg straw2 (esc) + \thash 0\t# rjenkins1 (esc) + \titem cephstore6236 weight 7.00000 (esc) + \titem cephstore6237 weight 7.00000 (esc) + \titem cephstore6239 weight 7.00000 (esc) + \titem cephstore6241 weight 7.00000 (esc) + \titem cephstore6243 weight 7.00000 (esc) + \titem cephstore6245 weight 7.00000 (esc) + \titem cephstore6336 weight 7.00000 (esc) + \titem cephstore6338 weight 7.00000 (esc) + \titem cephstore6339 weight 7.00000 (esc) + \titem cephstore6340 weight 7.00000 (esc) + \titem cephstore6343 weight 7.00000 (esc) + \titem cephstore6230 weight 7.00000 (esc) + \titem cephstore6231 weight 7.00000 (esc) + \titem cephstore6232 weight 7.00000 (esc) + \titem cephstore6233 weight 7.00000 (esc) + \titem cephstore6234 weight 7.00000 (esc) + \titem cephstore6235 weight 7.00000 (esc) } root default { \tid -1\t\t# do not change unnecessarily (esc) - \t# weight 238.000 (esc) + \t# weight 238.00000 (esc) \talg straw2 (esc) \thash 0\t# rjenkins1 (esc) - \titem irv-n2 weight 119.000 (esc) - \titem irv-n1 weight 119.000 (esc) + \titem irv-n2 weight 119.00000 (esc) + \titem irv-n1 weight 119.00000 (esc) } # rules diff --git a/src/test/crush/crush-choose-args-expected-one-more-0.txt b/src/test/crush/crush-choose-args-expected-one-more-0.txt index bad7f0becfe..e52f43a7469 100644 --- a/src/test/crush/crush-choose-args-expected-one-more-0.txt +++ b/src/test/crush/crush-choose-args-expected-one-more-0.txt @@ -29,18 +29,18 @@ type 11 root # buckets host HOST { id -2 # do not change unnecessarily - # weight 6.000 + # weight 6.00000 alg straw2 hash 0 # rjenkins1 - item osd.0 weight 3.000 - item osd.1 weight 3.000 + item osd.0 weight 3.00000 + item osd.1 weight 3.00000 } root default { id -1 # do not change unnecessarily - # weight 6.000 + # weight 6.00000 alg straw2 hash 0 # rjenkins1 - item HOST weight 6.000 + item HOST weight 6.00000 } # rules @@ -59,16 +59,16 @@ choose_args 0 { { bucket_id -1 weight_set [ - [ 2.000 ] - [ 1.000 ] + [ 2.00000 ] + [ 1.00000 ] ] ids [ -10 ] } { bucket_id -2 weight_set [ - [ 2.000 0.000 ] - [ 1.000 0.000 ] + [ 2.00000 0.00000 ] + [ 1.00000 0.00000 ] ] ids [ -20 1 ] } diff --git a/src/test/crush/crush-choose-args-expected-one-more-3.txt b/src/test/crush/crush-choose-args-expected-one-more-3.txt index 14525853950..295fe859830 100644 --- a/src/test/crush/crush-choose-args-expected-one-more-3.txt +++ b/src/test/crush/crush-choose-args-expected-one-more-3.txt @@ -29,18 +29,18 @@ type 11 root # buckets host HOST { id -2 # do not change unnecessarily - # weight 6.000 + # weight 6.00000 alg straw2 hash 0 # rjenkins1 - item osd.0 weight 3.000 - item osd.1 weight 3.000 + item osd.0 weight 3.00000 + item osd.1 weight 3.00000 } root default { id -1 # do not change unnecessarily - # weight 6.000 + # weight 6.00000 alg straw2 hash 0 # rjenkins1 - item HOST weight 6.000 + item HOST weight 6.00000 } # rules @@ -59,16 +59,16 @@ choose_args 0 { { bucket_id -1 weight_set [ - [ 5.000 ] - [ 5.000 ] + [ 5.00000 ] + [ 5.00000 ] ] ids [ -10 ] } { bucket_id -2 weight_set [ - [ 2.000 3.000 ] - [ 2.000 3.000 ] + [ 2.00000 3.00000 ] + [ 2.00000 3.00000 ] ] ids [ -20 1 ] } diff --git a/src/test/crush/crush_weights.sh b/src/test/crush/crush_weights.sh index bf2bf8b0baf..5b93f3a1afb 100755 --- a/src/test/crush/crush_weights.sh +++ b/src/test/crush/crush_weights.sh @@ -22,14 +22,14 @@ type 2 pool # buckets domain root { id -1 # do not change unnecessarily - # weight 5.000 + # weight 5.00000 alg straw2 hash 0 # rjenkins1 - item device0 weight 10.0 - item device1 weight 10.0 - item device2 weight 10.0 - item device3 weight 10.0 - item device4 weight 1.000 + item device0 weight 10.00000 + item device1 weight 10.00000 + item device2 weight 10.00000 + item device3 weight 10.00000 + item device4 weight 1.00000 } # rules rule data { |