]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: restore admin socket path in mrgw.sh 16540/head
authorCasey Bodley <cbodley@redhat.com>
Mon, 24 Jul 2017 19:07:17 +0000 (15:07 -0400)
committerCasey Bodley <cbodley@redhat.com>
Mon, 24 Jul 2017 19:21:09 +0000 (15:21 -0400)
ceph-conf was rejecting the entity name with:

error parsing 'radosgw.8000': expected string of the form TYPE.ID, valid
types are: auth, mon, osd, mds, mgr, client

these mstart/mrun/mrgw scripts carefully place their output files under
their respective run/<cluster-name>/out subdirectory to keep them from
clashing

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/mrgw.sh

index 92791780b3bc9802f50d1a8cb4467ee679ca9d9e..c5770ca917f28d402b3c8bdafdaa34f2013d9ccf 100755 (executable)
@@ -22,7 +22,7 @@ shift 2
 
 run_root=$script_root/run/$name
 pidfile=$run_root/out/radosgw.${port}.pid
-asokfile=$($ceph_bin/ceph-conf --show-config-value admin_socket --name radosgw.${port})
+asokfile=$run_root/out/radosgw.${port}.asok
 logfile=$run_root/out/radosgw.${port}.log
 
 $vstart_path/mstop.sh $name radosgw $port