From: Loic Dachary <loic@dachary.org>
Date: Sun, 2 Feb 2014 10:35:13 +0000 (+0100)
Subject: mon: osd-pool-create test no longer use hardcoded ruleset
X-Git-Tag: v0.78~226^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7b15cb1b6428b2d23f2ab537d9e6f6b63cc6e018;p=ceph.git

mon: osd-pool-create test no longer use hardcoded ruleset

For erasure-code the ruleset must be specified instead of relying on an
hardcoded value. Adapt the test to this for tests that do not otherwise
change behavior.

Reviewed-By: Christophe Courtaut <christophe.courtaut@gmail.com>
Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/test/mon/osd-pool-create.sh b/src/test/mon/osd-pool-create.sh
index 98e25e815564..e37c3f76baac 100755
--- a/src/test/mon/osd-pool-create.sh
+++ b/src/test/mon/osd-pool-create.sh
@@ -109,18 +109,23 @@ crush_ruleset=erasure_ruleset
 grep "$crush_ruleset try again" $DIR/log
 kill_mon
 
-expected='"foo":"bar"'
 # osd_pool_default_erasure_code_properties is JSON
+expected='"erasure-code-plugin":"example"'
 run_mon --osd_pool_default_erasure_code_properties "{$expected}"
-./ceph --format json osd dump | grep "$expected" && exit 1
-./ceph osd pool create poolA 12 12 erasure
+! ./ceph --format json osd dump | grep "$expected" || exit 1
+crush_ruleset=erasure_ruleset
+./ceph osd crush rule create-erasure $crush_ruleset
+./ceph osd pool create pool_erasure 12 12 erasure crush_ruleset=$crush_ruleset
 ./ceph --format json osd dump | grep "$expected"
 kill_mon
 
 # osd_pool_default_erasure_code_properties is plain text
-run_mon --osd_pool_default_erasure_code_properties 'foo=bar'
-./ceph --format json osd dump | grep "$expected" && exit 1
-./ceph osd pool create poolA 12 12 erasure
+expected='"erasure-code-plugin":"example"'
+run_mon --osd_pool_default_erasure_code_properties "erasure-code-plugin=example"
+! ./ceph --format json osd dump | grep "$expected" || exit 1
+crush_ruleset=erasure_ruleset
+./ceph osd crush rule create-erasure $crush_ruleset
+./ceph osd pool create pool_erasure 12 12 erasure crush_ruleset=$crush_ruleset
 ./ceph --format json osd dump | grep "$expected"
 kill_mon
 
@@ -128,8 +133,9 @@ run_mon
 
 # creating an erasure code pool sets defaults properties
 ./ceph --format json osd dump > $DIR/osd.json
-./ceph osd pool create erasurecodes 12 12 erasure
 ! grep "erasure-code-plugin" $DIR/osd.json || exit 1
+./ceph osd crush rule create-erasure erasure_ruleset
+./ceph osd pool create erasurecodes 12 12 erasure crush_ruleset=erasure_ruleset
 ./ceph --format json osd dump | tee $DIR/osd.json
 grep "erasure-code-plugin" $DIR/osd.json > /dev/null
 grep "erasure-code-directory" $DIR/osd.json > /dev/null