Skip to content

Commit

Permalink
Merge pull request #43004 from gregsfortytwo/wip-nodaemon
Browse files Browse the repository at this point in the history
vstart: make "--crimson" imply "--nodaemon"

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Chunmei Liu <chunmei.liu@intel.com>
Reviewed-by: Kefu Chai <tchaikov@gmail.com>
  • Loading branch information
athanatos committed Sep 1, 2021
2 parents f865217 + 98634e5 commit db226b9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion doc/dev/crimson/crimson.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions src/vstart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit db226b9

Please sign in to comment.