]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
vstart: add --valgrind_rgw 9299/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 20 May 2016 14:07:23 +0000 (10:07 -0400)
committerCasey Bodley <cbodley@redhat.com>
Tue, 24 May 2016 19:48:29 +0000 (15:48 -0400)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/vstart.sh

index 588f1d72cc19d5184ad7a9ce3544816505038d3c..a849184a5fe0648a32ccb1a89918c2e27e4e3c4b 100755 (executable)
@@ -117,7 +117,7 @@ usage=$usage"\t-l, --localhost: use localhost instead of hostname\n"
 usage=$usage"\t-i <ip>: bind to specific ip\n"
 usage=$usage"\t-r start radosgw (needs ceph compiled with --radosgw)\n"
 usage=$usage"\t-n, --new\n"
-usage=$usage"\t--valgrind[_{osd,mds,mon}] 'toolname args...'\n"
+usage=$usage"\t--valgrind[_{osd,mds,mon,rgw}] 'toolname args...'\n"
 usage=$usage"\t--nodaemon: use ceph-run as wrapper for mon/osd/mds\n"
 usage=$usage"\t--smallmds: limit mds cache size\n"
 usage=$usage"\t-m ip:port\t\tspecify monitor address\n"
@@ -189,6 +189,11 @@ case $1 in
            valgrind_mon=$2
            shift
            ;;
+    --valgrind_rgw )
+           [ -z "$2" ] && usage_exit
+           valgrind_rgw=$2
+           shift
+           ;;
     --nodaemon )
            nodaemon=1
            ;;
@@ -796,7 +801,7 @@ do_rgw()
 
     RGWSUDO=
     [ $CEPH_RGW_PORT -lt 1024 ] && RGWSUDO=sudo
-    $RGWSUDO $CEPH_BIN/radosgw -c $conf_fn --log-file=${CEPH_OUT_DIR}/rgw.log ${RGWDEBUG} --debug-ms=1
+    run 'rgw' $RGWSUDO $CEPH_BIN/radosgw -c $conf_fn --log-file=${CEPH_OUT_DIR}/rgw.log ${RGWDEBUG} --debug-ms=1
 }
 if [ "$start_rgw" -eq 1 ]; then
     do_rgw