From ebbfdc7a03382713b6151f93bf6ba9a434ee9517 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Fri, 18 Mar 2016 14:28:50 -0700 Subject: [PATCH] test_pool_create.sh: put test files in the test dir so they are cleaned up If they aren't cleaned up, tarball gitbuilders are unhappy. Signed-off-by: Josh Durgin --- src/test/test_pool_create.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/test_pool_create.sh b/src/test/test_pool_create.sh index 1d0c150cd6f55..657b6dda98499 100755 --- a/src/test/test_pool_create.sh +++ b/src/test/test_pool_create.sh @@ -34,16 +34,16 @@ function TEST_pool_create() { local poolname=rulepool local var=`ceph osd crush rule dump|grep -w ruleset|sed -n '$p'|grep -o '[0-9]\+'` var=`expr $var + 1 ` - ceph osd getcrushmap -o map1 - crushtool -d map1 -o map1.txt + ceph osd getcrushmap -o "$dir/map1" + crushtool -d "$dir/map1" -o "$dir/map1.txt" local minsize=0 local maxsize=1 - sed -i '/# end crush map/i\rule '$rulename' {\n ruleset \'$var'\n type replicated\n min_size \'$minsize'\n max_size \'$maxsize'\n step take default\n step choose firstn 0 type osd\n step emit\n }\n' map1.txt - crushtool -c map1.txt -o map1.bin - ceph osd setcrushmap -i map1.bin - ceph osd pool create $poolname 200 $rulename 2>rev - local result=$(cat rev|grep "Error EINVAL: pool size") + sed -i '/# end crush map/i\rule '$rulename' {\n ruleset \'$var'\n type replicated\n min_size \'$minsize'\n max_size \'$maxsize'\n step take default\n step choose firstn 0 type osd\n step emit\n }\n' "$dir/map1.txt" + crushtool -c "$dir/map1.txt" -o "$dir/map1.bin" + ceph osd setcrushmap -i "$dir/map1.bin" + ceph osd pool create $poolname 200 $rulename 2>"$dir/rev" + local result=$(cat "$dir/rev" | grep "Error EINVAL: pool size") if [ "$result" = "" ]; then -- 2.39.5