]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: advance thru maps sequentially
authorKefu Chai <kchai@redhat.com>
Thu, 28 Feb 2019 03:18:33 +0000 (11:18 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 16 Mar 2019 07:29:08 +0000 (15:29 +0800)
we should not do this in parallel.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/osd/osd.cc

index 1d0dbf89d702862f1b7f5e1e763f386646bd8448..bc1d245dac5a3a17c2e87370bd48c37fe3459b40 100644 (file)
@@ -534,8 +534,9 @@ seastar::future<> OSD::committed_osd_maps(version_t first,
 {
   logger().info("osd.{}: committed_osd_maps({}, {})", whoami, first, last);
   // advance through the new maps
-  return seastar::parallel_for_each(boost::irange(first, last + 1),
-                                    [this](epoch_t cur) {
+  return seastar::do_for_each(boost::make_counting_iterator(first),
+                              boost::make_counting_iterator(last + 1),
+                              [this](epoch_t cur) {
     return get_map(cur).then([this](cached_map_t&& o) {
       osdmap = std::move(o);
       if (up_epoch != 0 &&