vstart: some changes

no more crun wrapper; rename ceph_stop back to stop.sh

diff --git a/src/ceph_stop b/src/ceph_stop
deleted file mode 100755 (executable)
index 9837a0a..0000000
--- a/src/ceph_stop
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-do_killall() {
-       pg=`pgrep -f crun.*$1`
-       [ "$pg" != "" ] && kill $pg
-       killall $1
-}
-
-usage="usage: $0 [all] [mon] [mds] [osd]\n"
-
-let stop_all=1
-let stop_mon=0
-let stop_mds=0
-let stop_osd=0
-
-while [ $# -ge 1 ]; do
-    case $1 in
-       all )
-           stop_all=1
-           ;;
-       mon | cmon )
-           stop_mon=1
-           stop_all=0
-           ;;
-       mds | cmds )
-           stop_mds=1
-           stop_all=0
-           ;;
-       osd | cosd )
-           stop_osd=1
-           stop_all=0
-           ;;
-       * )
-           printf "$usage"
-           exit
-        esac
-        shift
-done
-
-if [ $stop_all -eq 1 ]; then
-       killall crun cmon cmds cosd
-       pkill -f valgrind.bin.\*cmon
-       pkill -f valgrind.bin.\*cosd
-       pkill -f valgrind.bin.\*cmds
-else
-       [ $stop_mon -eq 1 ] && do_killall cmon
-       [ $stop_mds -eq 1 ] && do_killall cmds
-       [ $stop_osd -eq 1 ] && do_killall cosd
-fi

diff --git a/src/stop.sh b/src/stop.sh
new file mode 100755 (executable)
index 0000000..9837a0a
--- /dev/null
+++ b/src/stop.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+do_killall() {
+       pg=`pgrep -f crun.*$1`
+       [ "$pg" != "" ] && kill $pg
+       killall $1
+}
+
+usage="usage: $0 [all] [mon] [mds] [osd]\n"
+
+let stop_all=1
+let stop_mon=0
+let stop_mds=0
+let stop_osd=0
+
+while [ $# -ge 1 ]; do
+    case $1 in
+       all )
+           stop_all=1
+           ;;
+       mon | cmon )
+           stop_mon=1
+           stop_all=0
+           ;;
+       mds | cmds )
+           stop_mds=1
+           stop_all=0
+           ;;
+       osd | cosd )
+           stop_osd=1
+           stop_all=0
+           ;;
+       * )
+           printf "$usage"
+           exit
+        esac
+        shift
+done
+
+if [ $stop_all -eq 1 ]; then
+       killall crun cmon cmds cosd
+       pkill -f valgrind.bin.\*cmon
+       pkill -f valgrind.bin.\*cosd
+       pkill -f valgrind.bin.\*cmds
+else
+       [ $stop_mon -eq 1 ] && do_killall cmon
+       [ $stop_mds -eq 1 ] && do_killall cmds
+       [ $stop_osd -eq 1 ] && do_killall cosd
+fi

diff --git a/src/vstart.sh b/src/vstart.sh
index abf3a9aae6a9af6b18a8aedc1acb92792b4e2ec4..5c30ab8d59b71d5a151fdc513424e393cb7a7b87 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -99,7 +99,7 @@ fi
 test -d dev/osd0/. && test -e dev/sudo && SUDO="sudo"
 
 if [ $start_all -eq 1 ]; then
-       $SUDO ./ceph_stop
+       $SUDO ./stop.sh
 fi
 $SUDO rm -f core*
 
@@ -160,7 +160,7 @@ if [ $start_mon -eq 1 ]; then
        if [ $start_mon -ne 0 ]; then
                for f in `seq 0 $((CEPH_NUM_MON-1))`; do
                    echo $valgrind $CEPH_BIN/cmon $ARGS $CMON_ARGS mondata/mon$f &
-                   $valgrind $CEPH_BIN/cmon $ARGS $CMON_ARGS mondata/mon$f &
+                   $valgrind $CEPH_BIN/cmon -p out/mon$f.pid $ARGS $CMON_ARGS mondata/mon$f &
                done
                sleep 1
        fi
@@ -176,7 +176,7 @@ if [ $start_osd -eq 1 ]; then
                fi
                echo start osd$osd
                echo $valgrind $SUDO $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
-               $valgrind $SUDO $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
+               $valgrind $SUDO $CEPH_BIN/cosd -p out/osd$f.pid -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
 # echo valgrind --leak-check=full --show-reachable=yes $CEPH_BIN/cosd dev/osd$osd --debug_ms 1 --debug_osd 20 --debug_filestore 10 --debug_ebofs 20 #1>out/o$osd #& #--debug_osd 40
        done
 fi