From: Kefu Chai <kchai@redhat.com>
Date: Mon, 12 Aug 2019 12:04:17 +0000 (+0800)
Subject: vstart: pass "--smp 1 --cpuset $osd" to crimson-osd
X-Git-Tag: v15.1.0~1896^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d80a8579b2555ed6f4e1756f36853c69aa322e9;p=ceph.git

vstart: pass "--smp 1 --cpuset $osd" to crimson-osd

for optimal performance when testing multiple crimson-osd in a vstart cluster

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index ecf3a6806b69..0001302ccee0 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -846,7 +846,14 @@ EOF
 EOF
         fi
         echo start osd.$osd
-        run 'osd' $osd $SUDO $CEPH_BIN/$ceph_osd $extra_osd_args -i $osd $ARGS $COSD_ARGS
+        local extra_seastar_args
+        if [ "$ceph_osd" == "crimson-osd" ]; then
+            # designate a single CPU node $osd for osd.$osd
+            extra_seastar_args="--smp 1 --cpuset $osd"
+        fi
+        run 'osd' $osd $SUDO $CEPH_BIN/$ceph_osd \
+            $extra_seastar_args $extra_osd_args \
+            -i $osd $ARGS $COSD_ARGS
     done
 }