vstart.sh: drop .ceph_port and use randomly selected available port

vstart.sh becomes independent of do_cmake.sh

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>

diff --git a/do_cmake.sh b/do_cmake.sh
index b8e092d1332cfbdc6d581b91838d306b937d8fbb..084194c4b8420303f1ff448647d22fbd15da93a8 100755 (executable)
--- a/do_cmake.sh
+++ b/do_cmake.sh
@@ -22,7 +22,4 @@ plugin dir = lib
 erasure code dir = lib
 EOF
 
-# give vstart a (hopefully) unique mon port to start with
-echo $(( RANDOM % 1000 + 40000 )) > .ceph_port
-
 echo done.

diff --git a/src/vstart.sh b/src/vstart.sh
index 55b10e91895140565e692796479462991e893a6c..0ceef3eda22ba9550147991e98b854e6d80ea5c8 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -805,9 +805,13 @@ if [ -n "$MON_ADDR" ]; then
        CMDS_ARGS=" -m "$MON_ADDR
 fi
 
-if [ -z "$CEPH_PORT" ]; then
-    CEPH_PORT=6789
-    [ -e ".ceph_port" ] && CEPH_PORT=`cat .ceph_port`
+if [ -z "$CEPH_PORT" ]
+then
+  while [ true ]
+  do
+    CEPH_PORT="$(echo $(( RANDOM % 1000 + 40000 )))"
+    ss -a -n | egrep ":${CEPH_PORT} .+LISTEN" 1>/dev/null 2>&1 || break
+  done
 fi
 
 [ -z "$INIT_CEPH" ] && INIT_CEPH=$CEPH_BIN/init-ceph