From: Sage Weil Date: Fri, 27 Feb 2009 23:44:14 +0000 (-0800) Subject: vstart: some changes X-Git-Tag: v0.7~106^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4fc829114ce39263b97fd5c5e35c68595ea974a1;p=ceph.git 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 index 9837a0affe1a..000000000000 --- 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 index 000000000000..9837a0affe1a --- /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 abf3a9aae6a9..5c30ab8d59b7 100755 --- 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