startnew.sh: sudo if btrfs

diff --git a/src/dstartnew.sh b/src/dstartnew.sh
index 26844e121c859fdfd55e2731bfc14c2b15ee7bdf..10712e13574291b0a540160a486d9ce1eef88cea 100755 (executable)
--- a/src/dstartnew.sh
+++ b/src/dstartnew.sh
@@ -44,7 +44,7 @@ do
    echo "---- host $host osd $osd dev $dev ----"
    ls -al $dev
    ssh cosd$host cd ceph/src \; ./cosd --mkfs_for_osd $osd $dev # --osd_auto_weight 1
-   ssh cosd$host cd ceph/src \; ./cosd $dev -d --debug_ms 1 --debug_osd 20 # --debug_filestore 10 --debug_ebofs 30 --osd_heartbeat_grace 300
+   ssh cosd$host cd ceph/src \; ./cosd $dev -d --debug_ms 1 --debug_osd 10 # --debug_filestore 10 --debug_ebofs 30 --osd_heartbeat_grace 300
 #   ssh cosd$host cd ceph/src \; valgrind --leak-check-full --show-reachable-yes ./cosd $dev --debug_ms 1 --debug_osd 20 --debug_filestore 10 1>out/o$osd \&
  done
 done

diff --git a/src/startnew.sh b/src/startnew.sh
index f946a51cb94f54bee43078cb0cf8d7cdccd68783..9e7140f4ea5f397a6db1f9c1a20948a71801ba7e 100755 (executable)
--- a/src/startnew.sh
+++ b/src/startnew.sh
@@ -1,10 +1,12 @@
 #!/bin/sh
 
-./stop.sh
-rm core*
+test -d dev/osd0 && SUDO="sudo"
+
+$SUDO ./stop.sh
+$SUDO rm core*
 
 test -d out || mkdir out
-rm out/*
+$SUDO rm out/*
 
 # figure machine's ip
 HOSTNAME=`hostname`
@@ -40,8 +42,8 @@ $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap
 
 for osd in 0 #1 2 3 
 do
- $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
- $CEPH_BIN/cosd $ARGS dev/osd$osd --debug_osd 40
+ $SUDO $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
+ $SUDO $CEPH_BIN/cosd $ARGS dev/osd$osd --debug_osd 40
 done
 
 # mds

diff --git a/src/vstartnew.sh b/src/vstartnew.sh
index 9da9d31cd21959597689f7f91bb47c1143d4a1f1..c669e2b14b68d09432fa52dc4bd564514d153afa 100755 (executable)
--- a/src/vstartnew.sh
+++ b/src/vstartnew.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 
-./stop.sh
-rm core*
+# sudo if btrfs
+test -d dev/osd0 && SUDO="sudo"
+
+$SUDO ./stop.sh
+$SUDO rm core*
 
 test -d out || mkdir out
-rm out/*
+$SUDO rm out/*
 
 # figure machine's ip
 HOSTNAME=`hostname`
@@ -37,9 +40,9 @@ $CEPH_BIN/cmonctl osd setmap -i .ceph_osdmap
 
 for osd in 0 #1 #2 3 #4 5 6 7 8 9 10 11 12 13 14 15
 do
- $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
+ $SUDO $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
 # 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
- $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd -d --debug_ms 1 --debug_osd 20 --debug_filestore 20
+ $SUDO $CEPH_BIN/cosd -m $IP:$CEPH_PORT dev/osd$osd -d --debug_ms 1 --debug_osd 20 --debug_filestore 20
 done
 
 # mds