From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 5 Apr 2019 18:32:06 +0000 (-0400)
Subject: vstart: only add --debug-ms=1 in RGWDEBUG
X-Git-Tag: v15.1.0~3015^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7e6d53233d858cd7750dc7113994c9645391e268;p=ceph-ci.git

vstart: only add --debug-ms=1 in RGWDEBUG

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

diff --git a/src/vstart.sh b/src/vstart.sh
index ed308ae9859..1b0dfe8a6b0 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1195,7 +1195,7 @@ do_rgw()
     # Start server
     RGWDEBUG=""
     if [ "$debug" -ne 0 ]; then
-        RGWDEBUG="--debug-rgw=20"
+        RGWDEBUG="--debug-rgw=20 --debug-ms=1"
     fi
 
     local CEPH_RGW_PORT_NUM="${CEPH_RGW_PORT}"
@@ -1212,7 +1212,7 @@ do_rgw()
     for rgw in j k l m n o p q r s t u v; do
         current_port=$((CEPH_RGW_PORT_NUM + i))
         echo start rgw on http${CEPH_RGW_HTTPS}://localhost:${current_port}
-        run 'rgw' $RGWSUDO $CEPH_BIN/radosgw -c $conf_fn --log-file=${CEPH_OUT_DIR}/radosgw.${current_port}.log --admin-socket=${CEPH_OUT_DIR}/radosgw.${current_port}.asok --pid-file=${CEPH_OUT_DIR}/radosgw.${current_port}.pid ${RGWDEBUG} --debug-ms=1 -n client.rgw "--rgw_frontends=${rgw_frontend} port=${current_port}${CEPH_RGW_HTTPS}"
+        run 'rgw' $RGWSUDO $CEPH_BIN/radosgw -c $conf_fn --log-file=${CEPH_OUT_DIR}/radosgw.${current_port}.log --admin-socket=${CEPH_OUT_DIR}/radosgw.${current_port}.asok --pid-file=${CEPH_OUT_DIR}/radosgw.${current_port}.pid ${RGWDEBUG} -n client.rgw "--rgw_frontends=${rgw_frontend} port=${current_port}${CEPH_RGW_HTTPS}"
         i=$(($i + 1))
         [ $i -eq $CEPH_NUM_RGW ] && break
     done