rearrange mkfs/start scripts a bit

diff --git a/src/boot.sh b/src/boot.sh
deleted file mode 100755 (executable)
index fbf354e..0000000
--- a/src/boot.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-./stop.sh
-rm core*
-
-test -d out || mkdir out
-rm out/*
-
-# figure machine's ip
-HOSTNAME=`hostname`
-IP=`host $HOSTNAME | cut -d ' ' -f 4`
-[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
-
-echo hostname $HOSTNAME
-echo "ip $IP"
-if [ `echo $IP | grep '^127\\.'` ]
-then
-       echo
-       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
-       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
-       echo "  machine's real IP."
-       echo
-fi
-
-# shared args
-ARGS="-d --bind $IP -o out --debug_ms 1"
-
-# monitor
-$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 20 --debug_ms 1
-
-# osds
-for osd in 0 1 2 3 
-do
- $CEPH_BIN/cosd $ARGS dev/osd$osd --debug_osd 40
-done
-
-# mds
-$CEPH_BIN/cmds $ARGS --debug_mds 20
-
-echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
-

diff --git a/src/mkcephfs.sh b/src/mkcephfs.sh
index ce71af8f4575f96df0bb634e3632ee26b0dfe56d..7f952ccb68ad69a7f905bc749412ef879b087f55 100755 (executable)
--- a/src/mkcephfs.sh
+++ b/src/mkcephfs.sh
@@ -21,7 +21,7 @@ $CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
 $CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
 
 # shared args
-ARGS="-d --bind $IP -o out --debug_ms 1"
+ARGS="-d --debug_ms 1"
 
 # start monitor
 $CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 20 --debug_ms 1

diff --git a/src/mkfs.sh b/src/mkfs.sh
index 036e829e6603ce8a3a2085f640150237deeb3c7b..056742b1f2f74aad42e54e9b16ad7bd175fe201c 100755 (executable)
--- a/src/mkfs.sh
+++ b/src/mkfs.sh
@@ -21,7 +21,7 @@ $CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
 $CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
 
 # shared args
-ARGS="-d --bind $IP -o out --debug_ms 1"
+ARGS="-d --debug_ms 1"
 
 # start monitor
 $CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 20 --debug_ms 1

diff --git a/src/restart.sh b/src/restart.sh
new file mode 100755 (executable)
index 0000000..7f386d2
--- /dev/null
+++ b/src/restart.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+./stop.sh
+rm core*
+
+test -d out || mkdir out
+rm out/*
+
+# figure machine's ip
+HOSTNAME=`hostname`
+IP=`host $HOSTNAME | cut -d ' ' -f 4`
+[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
+
+echo hostname $HOSTNAME
+echo "ip $IP"
+if [ `echo $IP | grep '^127\\.'` ]
+then
+       echo
+       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
+       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
+       echo "  machine's real IP."
+       echo
+fi
+
+# shared args
+ARGS="-d --debug_ms 1"
+
+# monitor
+$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 20 --debug_ms 1
+
+# osds
+for osd in 0 1 2 3 
+do
+ $CEPH_BIN/cosd $ARGS dev/osd$osd
+done
+
+# mds
+$CEPH_BIN/cmds $ARGS
+
+echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
+

diff --git a/src/start.sh b/src/start.sh
deleted file mode 100755 (executable)
index fbffd92..0000000
--- a/src/start.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-./stop.sh
-rm core*
-
-test -d out || mkdir out
-rm out/*
-
-# figure machine's ip
-HOSTNAME=`hostname`
-IP=`host $HOSTNAME | cut -d ' ' -f 4`
-[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
-
-echo hostname $HOSTNAME
-echo "ip $IP"
-if [ `echo $IP | grep '^127\\.'` ]
-then
-       echo
-       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
-       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
-       echo "  machine's real IP."
-       echo
-fi
-
-# build a fresh fs monmap, mon fs
-$CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
-$CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
-
-# shared args
-ARGS="-d"
-
-# start monitor
-$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
-
-
-# build and inject an initial osd map
-$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
-$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
-done
-
-# mds
-$CEPH_BIN/cmds $ARGS  # --debug_ms 1 #--debug_mds 20 --debug_ms 20
-
-echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
-

diff --git a/src/startnew.sh b/src/startnew.sh
new file mode 100755 (executable)
index 0000000..fbffd92
--- /dev/null
+++ b/src/startnew.sh
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+./stop.sh
+rm core*
+
+test -d out || mkdir out
+rm out/*
+
+# figure machine's ip
+HOSTNAME=`hostname`
+IP=`host $HOSTNAME | cut -d ' ' -f 4`
+[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
+
+echo hostname $HOSTNAME
+echo "ip $IP"
+if [ `echo $IP | grep '^127\\.'` ]
+then
+       echo
+       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
+       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
+       echo "  machine's real IP."
+       echo
+fi
+
+# build a fresh fs monmap, mon fs
+$CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
+$CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
+
+# shared args
+ARGS="-d"
+
+# start monitor
+$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
+
+
+# build and inject an initial osd map
+$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
+$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
+done
+
+# mds
+$CEPH_BIN/cmds $ARGS  # --debug_ms 1 #--debug_mds 20 --debug_ms 20
+
+echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
+

diff --git a/src/vstart.sh b/src/vstart.sh
deleted file mode 100755 (executable)
index d68b8b8..0000000
--- a/src/vstart.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-./stop.sh
-rm core*
-
-test -d out || mkdir out
-rm out/*
-
-# figure machine's ip
-HOSTNAME=`hostname`
-IP=`host $HOSTNAME | grep $HOSTNAME | cut -d ' ' -f 4`
-[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
-
-echo hostname $HOSTNAME
-echo "ip $IP"
-if [ `echo $IP | grep '^127\\.'` ]
-then
-       echo
-       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
-       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
-       echo "  machine's real IP."
-       echo
-fi
-
-# build a fresh fs monmap, mon fs
-$CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
-$CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
-
-# shared args
-ARGS="-d"
-
-# start monitor
-$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
-
-# build and inject an initial osd map
-$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
-$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_ms 1 --debug_osd 10 --debug_fakestore 10 #--debug_osd 40
-done
-
-# mds
-$CEPH_BIN/cmds $ARGS --debug_ms 1 --debug_mds 20 --mds_thrash_fragments 0 #--debug_ms 20
-
-echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
-

diff --git a/src/vstartnew.sh b/src/vstartnew.sh
new file mode 100755 (executable)
index 0000000..d68b8b8
--- /dev/null
+++ b/src/vstartnew.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+./stop.sh
+rm core*
+
+test -d out || mkdir out
+rm out/*
+
+# figure machine's ip
+HOSTNAME=`hostname`
+IP=`host $HOSTNAME | grep $HOSTNAME | cut -d ' ' -f 4`
+[ "$CEPH_BIN" == "" ] && CEPH_BIN=.
+
+echo hostname $HOSTNAME
+echo "ip $IP"
+if [ `echo $IP | grep '^127\\.'` ]
+then
+       echo
+       echo "WARNING: hostname resolves to loopback; remote hosts will not be able to"
+       echo "  connect.  either adjust /etc/hosts, or edit this script to use your"
+       echo "  machine's real IP."
+       echo
+fi
+
+# build a fresh fs monmap, mon fs
+$CEPH_BIN/monmaptool --create --clobber --add $IP:12345 --print .ceph_monmap
+$CEPH_BIN/mkmonfs --clobber mondata/mon0 --mon 0 --monmap .ceph_monmap
+
+# shared args
+ARGS="-d"
+
+# start monitor
+$CEPH_BIN/cmon $ARGS mondata/mon0 --debug_mon 10 --debug_ms 1
+
+# build and inject an initial osd map
+$CEPH_BIN/osdmaptool --clobber --createsimple .ceph_monmap 4 --print .ceph_osdmap
+$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_ms 1 --debug_osd 10 --debug_fakestore 10 #--debug_osd 40
+done
+
+# mds
+$CEPH_BIN/cmds $ARGS --debug_ms 1 --debug_mds 20 --mds_thrash_fragments 0 #--debug_ms 20
+
+echo "started.  stop.sh to stop.  see out/* (e.g. 'tail -f out/????') for debug output."
+