vstart: fix conf, use -d on startup, etc.

diff --git a/src/stop.sh b/src/stop.sh
index 9837a0affe1a8db960530cdf2be49abc463f0ceb..7320476cfa6f582037a2f4e6dff6e71971f937da 100755 (executable)
--- a/src/stop.sh
+++ b/src/stop.sh
@@ -38,7 +38,7 @@ while [ $# -ge 1 ]; do
 done
 
 if [ $stop_all -eq 1 ]; then
-       killall crun cmon cmds cosd
+       killall cmon cmds cosd
        pkill -f valgrind.bin.\*cmon
        pkill -f valgrind.bin.\*cosd
        pkill -f valgrind.bin.\*cmds

diff --git a/src/vstart.sh b/src/vstart.sh
index 5c30ab8d59b71d5a151fdc513424e393cb7a7b87..0df42bf184319ac495859b7799bc77e692b40478 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -71,17 +71,17 @@ if [ $start_all -eq 1 ]; then
        start_osd=1
 fi
 
-ARGS="-f"
+ARGS="-d -c $conf"
 
 if [ $debug -eq 0 ]; then
-       CMON_ARGS="--conf_file $conf --debug_mon 10 --debug_ms 1"
-       COSD_ARGS="--conf_file $conf "
-       CMDS_ARGS="--conf_file $conf --debug_ms 1"
+       CMON_ARGS="--debug_mon 10 --debug_ms 1"
+       COSD_ARGS=""
+       CMDS_ARGS="--debug_ms 1"
 else
        echo "** going verbose **"
-       CMON_ARGS="--conf_file $conf --lockdep 1 --debug_mon 20 --debug_ms 1 --debug_paxos 20"
-       COSD_ARGS="--conf_file $conf --lockdep 1 --debug_osd 25 --debug_journal 20 --debug_filestore 10 --debug_ms 1" # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
-       CMDS_ARGS="--conf_file $conf --lockdep 1 --mds_cache_size 500 --mds_log_max_segments 2 --debug_ms 1 --debug_mds 20 --mds_thrash_fragments 0 --mds_thrash_exports 1"
+       CMON_ARGS="--lockdep 1 --debug_mon 20 --debug_ms 1 --debug_paxos 20"
+       COSD_ARGS="--lockdep 1 --debug_osd 25 --debug_journal 20 --debug_filestore 10 --debug_ms 1" # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
+       CMDS_ARGS="--lockdep 1 --mds_cache_size 500 --mds_log_max_segments 2 --debug_ms 1 --debug_mds 20 --mds_thrash_fragments 0 --mds_thrash_exports 1"
 fi
 
 if [ "$MON_ADDR" != "" ]; then
@@ -159,8 +159,8 @@ if [ $start_mon -eq 1 ]; then
        # start monitors
        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 -p out/mon$f.pid $ARGS $CMON_ARGS mondata/mon$f &
+                   echo $valgrind $CEPH_BIN/cmon mondata/mon$f $ARGS $CMON_ARGS 
+                   $valgrind $CEPH_BIN/cmon -p out/mon$f.pid mondata/mon$f $ARGS $CMON_ARGS 
                done
                sleep 1
        fi
@@ -175,8 +175,8 @@ if [ $start_osd -eq 1 ]; then
                        $SUDO $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd # --debug_journal 20 --debug_osd 20 --debug_filestore 20 --debug_ebofs 20
                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 -p out/osd$f.pid -m $IP:$CEPH_PORT dev/osd$osd $ARGS $COSD_ARGS &
+               echo $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
@@ -185,8 +185,8 @@ fi
 if [ $start_mds -eq 1 ]; then
        for mds in `seq 0 $((CEPH_NUM_MDS-1))`
        do
-               echo $valgrind $CEPH_BIN/cmds $ARGS $CMDS_ARGS &
-               $valgrind $CEPH_BIN/cmds $ARGS $CMDS_ARGS &
+               echo $valgrind $CEPH_BIN/cmds $ARGS $CMDS_ARGS
+               $valgrind $CEPH_BIN/cmds $ARGS $CMDS_ARGS
 
 #valgrind --tool=massif $CEPH_BIN/cmds $ARGS --mds_log_max_segments 2 --mds_thrash_fragments 0 --mds_thrash_exports 0 > m  #--debug_ms 20
 #$CEPH_BIN/cmds -d $ARGS --mds_thrash_fragments 0 --mds_thrash_exports 0 #--debug_ms 20

diff --git a/src/workingdir.conf b/src/workingdir.conf
index 4be6ca3b3e305ad51546c1eb8078ed547c913291..2910545ac0ce55a133c46ce85325ac4dc6281cec 100644 (file)
--- a/src/workingdir.conf
+++ b/src/workingdir.conf
@@ -3,8 +3,8 @@
 # when running out of the directory you've compiled in.
 #
 [global]
-       dout dir = out
-       dout sym dir = out
+       log dir = out
+       log sym dir = out
        logger dir = log
        chdir root = false