vstart tests: specify ceph.conf

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/test/test_common.sh b/src/test/test_common.sh
index 3c4a6b3e338f56fbb9e991cf63753f268868bd41..cc992ebbb3a411e9aa588b0f382b8607557f9c66 100755 (executable)
--- a/src/test/test_common.sh
+++ b/src/test/test_common.sh
@@ -95,8 +95,8 @@ write_objects() {
                 chr=`perl -e "print chr(48+$v)"`
                 head -c $obj_size /dev/zero  | tr '\0' "$chr" > $TEMPDIR/ver$v
                 for i in `seq -w 1 $num_objs`; do
-                        ./rados -p $pool rm obj$i || die "radostool failed"
-                        ./rados -p $pool put obj$i $TEMPDIR/ver$v || die "radostool failed"
+                        ./rados -c ./ceph.conf -p $pool rm obj$i || die "radostool failed"
+                        ./rados -c ./ceph.conf -p $pool put obj$i $TEMPDIR/ver$v || die "radostool failed"
                 done
         done
 }
@@ -109,7 +109,7 @@ read_objects() {
        chr=`perl -e "print chr(48+$ver)"`
        head -c $obj_size /dev/zero  | tr '\0' "$chr" > $TEMPDIR/exemplar
         for i in `seq -w 1 $num_objs`; do
-                ./rados -p $pool get obj$i $TEMPDIR/out$i || die "radostool failed"
+                ./rados -c ./ceph.conf -p $pool get obj$i $TEMPDIR/out$i || die "radostool failed"
                cmp $TEMPDIR/out$i $TEMPDIR/exemplar || die "got back incorrect obj$i"
         done
 }
@@ -145,7 +145,7 @@ start_recovery() {
         CEPH_NUM_OSD=$1
         osd=0
         while [ $osd -lt $CEPH_NUM_OSD ]; do
-                ./ceph osd tell $osd debug kick_recovery_wq 0
+                ./ceph -c ./ceph.conf osd tell $osd debug kick_recovery_wq 0
                 osd=$((osd+1))
         done
 }

diff --git a/src/test/test_csyn.sh b/src/test/test_csyn.sh
index a4a1b9ae44b91a26916b0f1d22de05c68555e0ea..b722d6a5c969192672b2a6ff1eea74b0a411989e 100644 (file)
--- a/src/test/test_csyn.sh
+++ b/src/test/test_csyn.sh
@@ -20,7 +20,7 @@ osd max scrubs = 0' || die "vstart failed"
 }
 
 csyn_simple1_impl() {
-  ./csyn --syn writefile 100 1000 --syn writefile 100 1000 || die "csyn failed"
+  ./csyn -c ./ceph.conf --syn writefile 100 1000 --syn writefile 100 1000 || die "csyn failed"
 }
 
 csyn_simple1() {

diff --git a/src/test/test_lost.sh b/src/test/test_lost.sh
index 77d25126bb58dab9d2a9099f7c53cc061b1e9a67..2cdd991dc17d65a3eb3ff02f4b091626d6106b60 100755 (executable)
--- a/src/test/test_lost.sh
+++ b/src/test/test_lost.sh
@@ -94,7 +94,7 @@ lost1_impl() {
          # verify we get woken to an error when it's declared lost.
          echo "trying to get one of the unfound objects"
          (
-         ./rados -p data get obj02 $TEMPDIR/obj02 &&\
+         ./rados -c ./ceph.conf -p data get obj02 $TEMPDIR/obj02 &&\
            die "expected radostool error"
          ) &
        fi
@@ -108,7 +108,7 @@ lost1_impl() {
 
        # Reading from a lost object gives back an error code.
        # TODO: check error code
-       ./rados -p data get obj01 $TEMPDIR/obj01 &&\
+       ./rados -c ./ceph.conf -p data get obj01 $TEMPDIR/obj01 &&\
          die "expected radostool error"
 
        if [ "$try_to_fetch_unfound" -eq 1 ]; then

diff --git a/src/test/test_missing_unfound.sh b/src/test/test_missing_unfound.sh
index fb7fa3c8821beb6f68ffa5526049b55f8dbf5512..89949e98485a61f1d0276903728fae7779ca81a2 100755 (executable)
--- a/src/test/test_missing_unfound.sh
+++ b/src/test/test_missing_unfound.sh
@@ -2,7 +2,7 @@
 
 CEPH_NUM_OSD=3 ./vstart.sh -d -n -x -o 'osd recovery max active = 1'
 
-./ceph osd pool set data size 3
+./ceph -c ./ceph.conf osd pool set data size 3
 
 sleep 20
 
@@ -11,7 +11,7 @@ sleep 20
 
 for f in `seq 1 100`
 do
-    ./rados -p data put test_$f /etc/passwd
+    ./rados -c ./ceph.conf -p data put test_$f /etc/passwd
 done
 
 # zap some objects on both replicas

diff --git a/src/test/test_pools.sh b/src/test/test_pools.sh
index c1b798503a2f4c8661424f3d2f470e1bdb122a51..68143508c15b8b9d2766a7011f71f4ee263f5b02 100755 (executable)
--- a/src/test/test_pools.sh
+++ b/src/test/test_pools.sh
@@ -19,7 +19,7 @@ setup() {
 
 test629_impl() {
         # create the pool
-        ./rados mkpool foo || die "mkpool failed"
+        ./rados -c ./ceph.conf mkpool foo || die "mkpool failed"
 
         # Write lots and lots of objects
         write_objects 1 1 10 1000000 foo
@@ -31,7 +31,7 @@ test629_impl() {
         poll_cmd "./ceph pg debug degraded_pgs_exist" TRUE 3 120
 
         # delete the pool
-        ./rados rmpool foo || die "rmpool failed"
+        ./rados -c ./ceph.conf rmpool foo || die "rmpool failed"
 
         # make sure the system is stable
         sleep 10

diff --git a/src/test/test_split.sh b/src/test/test_split.sh
index 9211feabc08b3917cd841edfd3e795fb9d5cdd10..25223ec6bd89d0c0b7546109212880959c9191e6 100755 (executable)
--- a/src/test/test_split.sh
+++ b/src/test/test_split.sh
@@ -22,7 +22,7 @@ setup() {
 }
 
 get_pgp_num() {
-        ./ceph osd pool get data pgp_num > $TEMPDIR/pgp_num
+        ./ceph -c ./ceph.conf osd pool get data pgp_num > $TEMPDIR/pgp_num
         [ $? -eq 0 ] || die "failed to get pgp_num"
         PGP_NUM=`grep PGP_NUM $TEMPDIR/pgp_num | sed 's/.*PGP_NUM:\([ 0123456789]*\).*$/\1/'`
 }
@@ -37,7 +37,7 @@ split1_impl() {
         # Double the number of PGs
         PGP_NUM=$((PGP_NUM*2))
         echo "doubling PGP_NUM to $PGP_NUM..."
-        ./ceph osd pool set data pgp_num $PGP_NUM
+        ./ceph -c ./ceph.conf osd pool set data pgp_num $PGP_NUM
 
         sleep 30
 
@@ -53,7 +53,7 @@ split1() {
 many_pools() {
         setup 3
         for i in `seq 1 3000`; do
-                ./rados mkpool "pool${i}" || die "mkpool failed"
+                ./rados -c ./ceph.conf mkpool "pool${i}" || die "mkpool failed"
         done
         my_write_objects 1 10
 }

diff --git a/src/test/test_unfound.sh b/src/test/test_unfound.sh
index a16042dc361bcec51c3edf378a0db50a77e2b323..4f0c9c5a968035a3a240af3dc82fee19882a8852 100755 (executable)
--- a/src/test/test_unfound.sh
+++ b/src/test/test_unfound.sh
@@ -49,7 +49,7 @@ osd_resurrection_1_impl() {
         echo "Got unfound objects."
 
         (
-                ./rados -p data get obj01 $TEMPDIR/obj01 || die "radostool failed"
+                ./rados -c ./ceph.conf -p data get obj01 $TEMPDIR/obj01 || die "radostool failed"
         ) &
         sleep 5
         [ -e $TEMPDIR/obj01 ] && die "unexpected error: fetched unfound object?"