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 /src/test/crush | |
| 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>
Diffstat (limited to 'src/test/crush')
| -rw-r--r-- | src/test/crush/crush-choose-args-expected-one-more-0.txt | 18 | ||||
| -rw-r--r-- | src/test/crush/crush-choose-args-expected-one-more-3.txt | 18 | ||||
| -rwxr-xr-x | src/test/crush/crush_weights.sh | 12 |
3 files changed, 24 insertions, 24 deletions
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 { |