From: Casey Bodley Date: Thu, 19 Oct 2017 17:21:39 +0000 (-0400) Subject: rgw: mrgw.sh uses instance name 'client.rgw' X-Git-Tag: v13.0.1~249^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2ac1fd7066d56e8f42a0fa049382cb4916f1ad4;p=ceph.git rgw: mrgw.sh uses instance name 'client.rgw' in vstart.sh, rgw config was moved into the [client.rgw] section, which vstart always uses as the radosgw instance name. this broke the multisite tests in test/rgw/test_multi.py because they use mrgw.sh to start the gateways instead Signed-off-by: Casey Bodley --- diff --git a/src/mrgw.sh b/src/mrgw.sh index c699396b660f..0525f19addc5 100755 --- a/src/mrgw.sh +++ b/src/mrgw.sh @@ -27,4 +27,4 @@ logfile=$run_root/out/radosgw.${port}.log $vstart_path/mstop.sh $name radosgw $port -$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile +$vstart_path/mrun $name radosgw --rgw-frontends="civetweb port=$port" -n client.rgw --pid-file=$pidfile --admin-socket=$asokfile "$@" --log-file=$logfile