vstart: make "--crimson" imply "--nodaemon"

If you want to run multiple crimson-osd instances, you need nodaemon. Default
to nodaemon when using crimson.

Add a new "--crimson-foreground" which preserves the old behavior, in case
it's needed.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>

diff --git a/doc/dev/crimson/crimson.rst b/doc/dev/crimson/crimson.rst
index 41651e1672f7fab9178eb550ae0d5acca88c916a..2e2514f05045839b68623f40738c9a36eacc9944 100644 (file)
--- a/doc/dev/crimson/crimson.rst
+++ b/doc/dev/crimson/crimson.rst
@@ -153,7 +153,7 @@ So, a typical command to start a single-crimson-node cluster is::
 
   $  MGR=1 MON=1 OSD=1 MDS=0 RGW=0 ../src/vstart.sh -n -x \
     --without-dashboard --cyanstore \
-    --crimson --nodaemon --redirect-output \
+    --crimson --redirect-output \
     --osd-args "--memory 4G"
 
 Where we assign 4 GiB memory, a single thread running on core-0 to crimson-osd.

diff --git a/src/vstart.sh b/src/vstart.sh
index a0481e3e44d91011ffae32395cb76d5886122388..98c7ad635cc576b7b885a49681306d2a5b43e915 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -233,6 +233,7 @@ options:
        --msgr2: use msgr2 only
        --msgr21: use msgr2 and msgr1
        --crimson: use crimson-osd instead of ceph-osd
+    --crimson-foreground: use crimson-osd, but run it in the foreground
        --osd-args: specify any extra osd specific options
        --bluestore-devs: comma-separated list of blockdevs to use for bluestore
        --bluestore-zoned: blockdevs listed by --bluestore-devs are zoned devices (HM-SMR HDD or ZNS SSD)
@@ -301,6 +302,11 @@ case $1 in
         ;;
     --crimson)
         ceph_osd=crimson-osd
+        nodaemon=1
+        ;;
+    --crimson-foreground)
+        ceph_osd=crimson-osd
+        nodaemon=0
         ;;
     --osd-args)
         extra_osd_args="$2"