From: Kefu Chai <kchai@redhat.com>
Date: Thu, 5 Dec 2019 07:54:23 +0000 (+0800)
Subject: Merge pull request #31732 from aclamk/wip-vstart-osds-parallel
X-Git-Tag: v15.1.0~652
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=38810721be96f10e4ce0ab52fe2e95d58f667317;p=ceph-ci.git

Merge pull request #31732 from aclamk/wip-vstart-osds-parallel

vstart: Now all OSDs are starting in parallel. Use --no-parallel to revert to sequential.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

38810721be96f10e4ce0ab52fe2e95d58f667317
diff --cc src/vstart.sh
index a132d0c8797,18d333651a2..aa1f4405f12
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@@ -880,14 -882,24 +886,27 @@@ EO
          if [ "$ceph_osd" == "crimson-osd" ]; then
              # designate a single CPU node $osd for osd.$osd
              extra_seastar_args="--smp 1 --cpuset $osd"
 +            if [ "$debug" -ne 0 ]; then
 +              extra_seastar_args+=" --debug"
 +            fi
          fi
+         local osd_pid
          run 'osd' $osd $SUDO $CEPH_BIN/$ceph_osd \
              $extra_seastar_args $extra_osd_args \
-             -i $osd $ARGS $COSD_ARGS
+             -i $osd $ARGS $COSD_ARGS &
+         osd_pid=$!
+         if $parallel; then
+             osds_wait=$osd_pid
+         else
+             wait $osd_pid
+         fi
      done
+     if $parallel; then
+         for p in $osds_wait; do
+             wait $p
+         done
+         debug echo OSDs started
+     fi
      if [ $inc_osd_num -gt 0 ]; then
          # update num osd
          new_maxosd=$($CEPH_BIN/ceph osd getmaxosd | sed -e 's/max_osd = //' -e 's/ in epoch.*//')