From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 20 May 2016 14:07:23 +0000 (-0400)
Subject: vstart: add --valgrind_rgw
X-Git-Tag: v11.0.0~365^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a947bef40204f7aa183772678a745310928cc5f;p=ceph.git

vstart: add --valgrind_rgw

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 588f1d72cc19..a849184a5fe0 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -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