test/cli/crushtool: default tunables are now firefly

Adjust accordingly to keep tests passing.

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

diff --git a/src/test/cli/crushtool/arg-order-checks.t b/src/test/cli/crushtool/arg-order-checks.t
index 4d2ccae3a1ffe883f586d59680fdbb5f9076f1a0..8ee193431cdb9803c8ac9c6930cd4500724ada14 100644 (file)
--- a/src/test/cli/crushtool/arg-order-checks.t
+++ b/src/test/cli/crushtool/arg-order-checks.t
@@ -4,7 +4,7 @@
   tunable straw_calc_version 1
 # build then reweight-item then tree
   $ map="$TESTDIR/foo"
-  $ crushtool --outfn "$map" --build --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
+  $ crushtool --outfn "$map" --build --set-chooseleaf-vary-r 0 --num_osds 25 node straw 5 rack straw 1 root straw 0 --reweight-item osd.2 99 -o "$map" --tree
   crushtool reweighting item osd.2 to 99
   ID\tWEIGHT\tTYPE NAME (esc)
   -11\t123.00000\troot root (esc)

diff --git a/src/test/cli/crushtool/build.t b/src/test/cli/crushtool/build.t
index 0bf13e0e3f7fe7863f1de4c2005de7b0a68f4a0d..5fa4b504eb4d34b6508cc6fbb046d2df92f97971 100644 (file)
--- a/src/test/cli/crushtool/build.t
+++ b/src/test/cli/crushtool/build.t
@@ -31,6 +31,7 @@
   tunable choose_local_fallback_tries 0
   tunable choose_total_tries 50
   tunable chooseleaf_descend_once 1
+  tunable chooseleaf_vary_r 1
   
   # devices
   device 0 osd.0