From: chunmei Liu <chunmei.liu@intel.com>
Date: Sat, 9 Mar 2019 01:28:16 +0000 (-0800)
Subject: vstart.sh: pass osd specific options to OSD
X-Git-Tag: v15.0.0~134^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d272b182d0a59dfa4c4f5e2679bd2afe984869d1;p=ceph-ci.git

vstart.sh: pass osd specific options to OSD

--osd-args : for passing osd specific args

this allows us to pass seastar related options to crimson-osd

Signed-off-by: chunmei Liu <chunmei.liu@intel.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index e97ae5164a2..861fb58684f 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -195,6 +195,7 @@ usage=$usage"\t--msgr1: use msgr1 only\n"
 usage=$usage"\t--msgr2: use msgr2 only\n"
 usage=$usage"\t--msgr21: use msgr2 and msgr1\n"
 usage=$usage"\t--crimson: use crimson-osd instead of ceph-osd\n"
+usage=$usage"\t--osd-args: specify any extra osd specific options\n"
 
 usage_exit() {
 	printf "$usage"
@@ -232,6 +233,10 @@ case $1 in
     --crimson )
         ceph_osd=crimson-osd
         ;;
+    --osd-args )
+        extra_osd_args="$2"
+        shift
+        ;;
     --msgr1 )
 	msgr="1"
 	;;
@@ -759,7 +764,7 @@ EOF
 	    echo "{\"cephx_secret\": \"$OSD_SECRET\"}" > $CEPH_DEV_DIR/osd$osd/new.json
             ceph_adm osd new $uuid -i $CEPH_DEV_DIR/osd$osd/new.json
 	    rm $CEPH_DEV_DIR/osd$osd/new.json
-            $SUDO $CEPH_BIN/$ceph_osd -i $osd $ARGS --mkfs --key $OSD_SECRET --osd-uuid $uuid
+            $SUDO $CEPH_BIN/$ceph_osd $extra_osd_args -i $osd $ARGS --mkfs --key $OSD_SECRET --osd-uuid $uuid
 
             local key_fn=$CEPH_DEV_DIR/osd$osd/keyring
 	    cat > $key_fn<<EOF
@@ -770,7 +775,7 @@ EOF
             ceph_adm -i "$key_fn" auth add osd.$osd osd "allow *" mon "allow profile osd" mgr "allow profile osd"
         fi
         echo start osd.$osd
-        run 'osd' $SUDO $CEPH_BIN/$ceph_osd -i $osd $ARGS $COSD_ARGS
+        run 'osd' $SUDO $CEPH_BIN/$ceph_osd $extra_osd_args -i $osd $ARGS $COSD_ARGS
     done
 }