From 6ac63fc43d3499cf7d1c1bc3a37eee8aa9c54eb1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Fri, 15 Apr 2022 16:48:10 +0200 Subject: [PATCH] crimson/osd: reduce unnecessary indentation level in PGAdvanceMap::start() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński --- .../osd/osd_operations/pg_advance_map.cc | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/crimson/osd/osd_operations/pg_advance_map.cc b/src/crimson/osd/osd_operations/pg_advance_map.cc index a96479d4076e7..5257b7ce4dc7b 100644 --- a/src/crimson/osd/osd_operations/pg_advance_map.cc +++ b/src/crimson/osd/osd_operations/pg_advance_map.cc @@ -58,40 +58,40 @@ seastar::future<> PGAdvanceMap::start() IRef ref = this; return with_blocking_future( handle.enter(pg->peering_request_pg_pipeline.process)) - .then([this] { - if (do_init) { - pg->handle_initialize(rctx); - pg->handle_activate_map(rctx); - } - return seastar::do_for_each( - boost::make_counting_iterator(from + 1), - boost::make_counting_iterator(to + 1), - [this](epoch_t next_epoch) { - return osd.get_map(next_epoch).then( - [this] (cached_map_t&& next_map) { - pg->handle_advance_map(next_map, rctx); - }); - }).then([this] { - pg->handle_activate_map(rctx); - handle.exit(); - if (do_init) { - osd.pg_map.pg_created(pg->get_pgid(), pg); - osd.shard_services.inc_pg_num(); - logger().info("PGAdvanceMap::start new pg {}", *pg); - } - return seastar::when_all_succeed( - pg->get_need_up_thru() \ - ? osd.shard_services.send_alive(pg->get_same_interval_since()) - : seastar::now(), - osd.shard_services.dispatch_context( - pg->get_collection_ref(), - std::move(rctx))); - }).then_unpack([this] { - return osd.shard_services.send_pg_temp(); - }); - }).then([this, ref=std::move(ref)] { - logger().debug("{}: complete", *this); - }); + .then([this] { + if (do_init) { + pg->handle_initialize(rctx); + pg->handle_activate_map(rctx); + } + return seastar::do_for_each( + boost::make_counting_iterator(from + 1), + boost::make_counting_iterator(to + 1), + [this](epoch_t next_epoch) { + return osd.get_map(next_epoch).then( + [this] (cached_map_t&& next_map) { + pg->handle_advance_map(next_map, rctx); + }); + }).then([this] { + pg->handle_activate_map(rctx); + handle.exit(); + if (do_init) { + osd.pg_map.pg_created(pg->get_pgid(), pg); + osd.shard_services.inc_pg_num(); + logger().info("PGAdvanceMap::start new pg {}", *pg); + } + return seastar::when_all_succeed( + pg->get_need_up_thru() \ + ? osd.shard_services.send_alive(pg->get_same_interval_since()) + : seastar::now(), + osd.shard_services.dispatch_context( + pg->get_collection_ref(), + std::move(rctx))); + }).then_unpack([this] { + return osd.shard_services.send_pg_temp(); + }); + }).then([this, ref=std::move(ref)] { + logger().debug("{}: complete", *this); + }); } } -- 2.39.5