From: Kefu Chai <kchai@redhat.com>
Date: Wed, 16 Jun 2021 10:27:07 +0000 (+0800)
Subject: crimson/osd: reindent
X-Git-Tag: v17.1.0~1630^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F41882%2Fhead;p=ceph.git

crimson/osd: reindent

for less indent, hence better readability

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

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 637dd9d598ad..93b633afb5ac 100644
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -88,33 +88,34 @@ seastar::future<> ClientRequest::start()
           epoch_t same_interval_since = pgref->get_interval_start_epoch();
           logger().debug("{} same_interval_since: {}", *this, same_interval_since);
           const bool has_pg_op = is_pg_op();
-          auto interruptible_do_op =
-            interruptor::wrap_function([this, has_pg_op, pgref] {
-              PG &pg = *pgref;
-              if (pg.can_discard_op(*m)) {
-                return interruptible_future<>(
-                  osd.send_incremental_map(conn, m->get_map_epoch()));
-              }
+          auto interruptible_do_op = interruptor::wrap_function([=] {
+            PG &pg = *pgref;
+            if (pg.can_discard_op(*m)) {
+              return interruptible_future<>(
+                osd.send_incremental_map(conn, m->get_map_epoch()));
+            }
+            return with_blocking_future_interruptible<IOInterruptCondition>(
+              handle.enter(pp(pg).await_map)
+            ).then_interruptible([this, &pg] {
+              return with_blocking_future_interruptible<IOInterruptCondition>(
+                pg.osdmap_gate.wait_for_map(m->get_min_epoch()));
+            }).then_interruptible([this, &pg](auto map) {
               return with_blocking_future_interruptible<IOInterruptCondition>(
-                handle.enter(pp(pg).await_map)
-              ).then_interruptible([this, &pg] {
-                return with_blocking_future_interruptible<IOInterruptCondition>(
-                    pg.osdmap_gate.wait_for_map(m->get_min_epoch()));
-              }).then_interruptible([this, &pg](auto map) {
-                return with_blocking_future_interruptible<IOInterruptCondition>(
-                    handle.enter(pp(pg).wait_for_active));
-              }).then_interruptible([this, &pg]() {
-                return with_blocking_future_interruptible<IOInterruptCondition>(
-                    pg.wait_for_active_blocker.wait());
-              }).then_interruptible([this, has_pg_op, pgref=std::move(pgref)]() mutable {
-                if (m->finish_decode()) {
-                  m->clear_payload();
-                }
-                return (has_pg_op ?
-                        process_pg_op(pgref) :
-                        process_op(pgref));
-              });
+                handle.enter(pp(pg).wait_for_active));
+            }).then_interruptible([this, &pg]() {
+              return with_blocking_future_interruptible<IOInterruptCondition>(
+                pg.wait_for_active_blocker.wait());
+            }).then_interruptible([this,
+                                   has_pg_op,
+                                   pgref=std::move(pgref)]() mutable {
+              if (m->finish_decode()) {
+                m->clear_payload();
+              }
+              return (has_pg_op ?
+                      process_pg_op(pgref) :
+                      process_op(pgref));
             });
+          });
           // keep the ordering of non-pg ops when across pg internvals
           return (has_pg_op ?
                   interruptible_do_op() :