crushtool: fix cli tests given new less-chatty output, help

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/test/cli/crushtool/exhaustive-search.t b/src/test/cli/crushtool/exhaustive-search.t
index 7256bcd72c60a73fb7d409f24c097cb8fe317386..1b1bfbdefe98feae0f7ca647ca507d340b627782 100644 (file)
--- a/src/test/cli/crushtool/exhaustive-search.t
+++ b/src/test/cli/crushtool/exhaustive-search.t
@@ -1,75 +1,14 @@
 # This detects the incorrect mapping (due to off by one error in
 # linear search) that caused #1594
   $ crushtool -i "$TESTDIR/five-devices.crushmap" --test --x 3 --rule 2 -v --weight 1 0 --weight 2 0 --weight 4 0
-  devices weights (hex): [10000,0,0,10000,0]
   rule 2 (rbd), x = 3..3, numrep = 1..10
-   rule 2 x 3 [0]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t0 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 1 result size == 1:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 2 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 3 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 4 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 5 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 6 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 7 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 8 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 9 result size == 2:\t1/1 (esc)
-   rule 2 x 3 [0,3]
-    device 0:\t1 (esc)
-    device 1:\t0 (esc)
-    device 2:\t0 (esc)
-    device 3:\t1 (esc)
-    device 4:\t0 (esc)
   rule 2 (rbd) num_rep 10 result size == 2:\t1/1 (esc)

diff --git a/src/test/cli/crushtool/help.t b/src/test/cli/crushtool/help.t
index af411aee9908adf38de4af893101b77cf39ca6a9..26cd17732c568121052ca0ad8a7da940ee4113a9 100644 (file)
--- a/src/test/cli/crushtool/help.t
+++ b/src/test/cli/crushtool/help.t
@@ -12,6 +12,8 @@
         [--min-x x] [--max-x x] [--x x]
         [--min-rule r] [--max-rule r] [--rule r]
         [--num-rep n]
+        [--batches b]
+      --simulate           simulate placements using a RNG
         [--weight|-w devno weight]
                            where weight is 0 to 1.0
      -i mapfn --add-item id weight name [--loc type name ...]
@@ -26,4 +28,7 @@
                            reweight a given item (and adjust ancestor
                            weights as needed)
      -i mapfn --reweight   recalculate all bucket weights
+     --output-utilization       output OSD usage
+     --output utilization-all   include zero weight items
+     --output-statistics        output chi squared statistics
   [1]