import quincy beta 17.1.0

[ceph.git] / ceph / src / test / cli / crushtool / add-item.t

diff --git a/ceph/src/test/cli/crushtool/add-item.t b/ceph/src/test/cli/crushtool/add-item.t
index 17127db590f63ba19d4f525de3ad73a1d2573635..dc056d005d22369fcf69fefb56e304105bdc2d3d 100644 (file)
--- a/ceph/src/test/cli/crushtool/add-item.t
+++ b/ceph/src/test/cli/crushtool/add-item.t
@@ -16,26 +16,24 @@
   # 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
   rule data {
   \tid 0 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -43,8 +41,6 @@
   rule metadata {
   \tid 1 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -52,8 +48,6 @@
   rule rbd {
   \tid 2 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -61,8 +55,6 @@
   rule simple-rule {
   \tid 3 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -85,26 +77,24 @@
   # 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
   rule data {
   \tid 0 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -112,8 +102,6 @@
   rule metadata {
   \tid 1 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -121,8 +109,6 @@
   rule rbd {
   \tid 2 (esc)
   \ttype replicated (esc)
-  \tmin_size 1 (esc)
-  \tmax_size 10 (esc)
   \tstep take cluster0 (esc)
   \tstep chooseleaf firstn 0 type host (esc)
   \tstep emit (esc)
@@ -130,18 +116,18 @@
   
   # end crush map
   $ crushtool -d two -o final
-  $ cmp final "$TESTDIR/simple.template.two"
+  $ diff final "$TESTDIR/simple.template.two"
   $ crushtool -i two --add-item 1 1.0 device1 --loc host host0 --loc cluster cluster0 -o three 2>/dev/null >/dev/null || echo FAIL
   FAIL
   $ crushtool -i two --remove-item device1 -o four > /dev/null
   $ crushtool -d four -o final
-  $ cmp final "$TESTDIR/simple.template.four"
+  $ diff final "$TESTDIR/simple.template.four"
   $ crushtool -i two --update-item 1 2.0 osd1 --loc host host1 --loc cluster cluster0 -o five > /dev/null
   $ crushtool -d five -o final
-  $ cmp final "$TESTDIR/simple.template.five"
+  $ diff final "$TESTDIR/simple.template.five"
   $ crushtool -i five --update-item 1 2.0 osd1 --loc host host1 --loc cluster cluster0 -o six > /dev/null
   $ crushtool -i five --show-location 1
   cluster\tcluster0 (esc)
   host\thost1 (esc)
   $ crushtool -d six -o final
-  $ cmp final "$TESTDIR/simple.template.five"
+  $ diff final "$TESTDIR/simple.template.five"