From: Loic Dachary <loic-201408@dachary.org>
Date: Wed, 3 Sep 2014 12:18:48 +0000 (+0200)
Subject: tests: set the failure domain to OSD by default
X-Git-Tag: v0.86~53^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ffc5ee53c34aabbba016c6e1d6b7a91c3124ea1;p=ceph.git

tests: set the failure domain to OSD by default

So that tests do not need to do it to be able to use the default rbd
pool to store objects.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/src/test/mon/mon-test-helpers.sh b/src/test/mon/mon-test-helpers.sh
index 052b1ca3fbdb..aa729b142631 100644
--- a/src/test/mon/mon-test-helpers.sh
+++ b/src/test/mon/mon-test-helpers.sh
@@ -42,6 +42,7 @@ function run_mon() {
     ./ceph-mon \
         --id $id \
         --paxos-propose-interval=0.1 \
+        --osd-crush-chooseleaf-type=0 \
         --osd-pool-default-erasure-code-directory=.libs \
         --debug-mon 20 \
         --debug-ms 20 \
diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index eaf7452d526d..d8d67d9480e9 100755
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -39,7 +39,7 @@ function TEST_crush_rule_create_simple() {
     local dir=$1
     ./ceph --format xml osd crush rule dump replicated_ruleset | \
         egrep '<op>take</op><item>[^<]+</item><item_name>default</item_name>' | \
-        grep '<op>chooseleaf_firstn</op><num>0</num><type>host</type>' || return 1
+        grep '<op>choose_firstn</op><num>0</num><type>osd</type>' || return 1
     local ruleset=ruleset0
     local root=host1
     ./ceph osd crush add-bucket $root host