vstart.sh: default to -n ; add -N | --not-new for restart case

I never don't do -n; I'm guessing others are in the same boat.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index cd1443f9c535aef4906a49a06a62a3eff17bba8f..c63e3ec2950cd46a7e8f19640df72e589cf03eac 100755 (executable)
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -151,7 +151,7 @@ def cat_file(level, filename):
 
 def vstart(new, opt=""):
     print("vstarting....", end="")
-    NEW = new and "-n" or ""
+    NEW = new and "-n" or "-N"
     call("MON=1 OSD=4 CEPH_PORT=7400 {path}/src/vstart.sh --short -l {new} -d mon osd {opt} > /dev/null 2>&1".format(new=NEW, opt=opt, path=CEPH_ROOT), shell=True)
     print("DONE")
 

diff --git a/src/vstart.sh b/src/vstart.sh
index 49bbe4c574b0c0b9f830d8a175d59fbd6be73c6f..338182e4028595bd4a24940a85ba2dbcce893d99 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -78,7 +78,7 @@ else
 fi
 
 extra_conf=""
-new=0
+new=1
 standby=0
 debug=0
 start_all=1
@@ -116,7 +116,8 @@ usage=$usage"\t-s, --standby_mds: Generate standby-replay MDS for each active\n"
 usage=$usage"\t-l, --localhost: use localhost instead of hostname\n"
 usage=$usage"\t-i <ip>: bind to specific ip\n"
 usage=$usage"\t-r start radosgw (needs ceph compiled with --radosgw)\n"
-usage=$usage"\t-n, --new\n"
+usage=$usage"\t-n, --new (default)\n"
+usage=$usage"\t-N, --not-new: reuse existing cluster config\n"
 usage=$usage"\t--valgrind[_{osd,mds,mon,rgw}] 'toolname args...'\n"
 usage=$usage"\t--nodaemon: use ceph-run as wrapper for mon/osd/mds\n"
 usage=$usage"\t--smallmds: limit mds cache size\n"
@@ -169,6 +170,9 @@ case $1 in
     --new | -n )
            new=1
            ;;
+    --not-new | -N )
+       new=0
+       ;;
     --short )
            short=1
            ;;