import quincy beta 17.1.0

[ceph.git] / ceph / src / test / cli / crushtool / check-overlapped-rules.crushmap.txt

diff --git a/ceph/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt b/ceph/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
index cd888635a350e5c41581fe1f6be5a3574a0edb79..b87342c7088d0b2a76617252976c01b037cf2c67 100644 (file)
--- a/ceph/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
+++ b/ceph/src/test/cli/crushtool/check-overlapped-rules.crushmap.txt
@@ -11,78 +11,64 @@ 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 {
-       ruleset 0
+       id 0
        type replicated
-       min_size 1
-       max_size 3
        step take host0
        step choose firstn 0 type osd
        step emit
 }
 
 rule rule-r1 {
-       ruleset 0
+       id 0
        type replicated
-       min_size 1
-       max_size 1
        step take host0
        step choose firstn 0 type osd
        step emit
 }
 
 rule rule-r2 {
-       ruleset 0
+       id 0
        type replicated
-       min_size 1
-       max_size 2
        step take host0
        step choose firstn 0 type osd
        step emit
 }
 
 rule rule-r3 {
-       ruleset 0
+       id 0
        type replicated
-       min_size 2
-       max_size 3
        step take host0
        step choose indep 0 type osd
        step emit
 }
 
 rule rule-r4 {
-       ruleset 0
+       id 0
        type replicated
-       min_size 4
-       max_size 5
        step take host0
        step choose indep 0 type osd
        step emit
 }
 
 rule rule-e0 {
-       ruleset 0
+       id 0
        type erasure
-       min_size 1
-       max_size 10
        step take host0
        step choose indep 0 type osd
        step emit
 }
 
 rule rule-e1 {
-       ruleset 1
+       id 1
        type erasure
-       min_size 1
-       max_size 10
        step take host0
        step choose indep 0 type osd
        step emit