From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 17 Dec 2015 22:53:03 +0000 (-0800)
Subject: rgw: test_multi: start radosgw with debug logs, asok
X-Git-Tag: v10.1.0~354^2~116
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aa5de3b282fa0ab7ae05036d1c4b19649d496eda;p=ceph.git

rgw: test_multi: start radosgw with debug logs, asok

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/mrgw.sh b/src/mrgw.sh
index ce309e5af68..c58115ef7cc 100755
--- a/src/mrgw.sh
+++ b/src/mrgw.sh
@@ -13,7 +13,8 @@ shift 2
 
 run_root=$script_root/run/$name
 pidfile=$run_root/out/radosgw.${port}.pid
+asokfile=$run_root/out/radosgw.${port}.asok
 
 $script_root/mstop.sh $name radosgw $port
 
-$script_root/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile "$@"
+$script_root/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile --admin-socket=$asokfile "$@"
diff --git a/src/test/rgw/test-rgw-common.sh b/src/test/rgw/test-rgw-common.sh
index e1e43596431..47d02bcf044 100644
--- a/src/test/rgw/test-rgw-common.sh
+++ b/src/test/rgw/test-rgw-common.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+rgw_flags="--debug-rgw=20 --debug-ms=1"
+
 function _assert {
   src=$1; shift
   lineno=$1; shift
@@ -73,7 +75,7 @@ function rgw_admin {
 function rgw {
   [ $# -ne 2 ] && echo "rgw() needs 2 params" && exit 1
 
-  echo "$root_path/mrgw.sh c$1 $2"
+  echo "$root_path/mrgw.sh c$1 $2 $rgw_flags"
 }
 
 function init_first_zone {