From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 4 Oct 2021 14:35:30 +0000 (+0000)
Subject: crimson/osd: squeeze one indentation level from PeeringEvent::start().
X-Git-Tag: v17.1.0~713^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=28ef412f0c8730d6108a8ae3b2172e0a89a5995a;p=ceph.git

crimson/osd: squeeze one indentation level from PeeringEvent::start().

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/peering_event.cc b/src/crimson/osd/osd_operations/peering_event.cc
index 7299c9421ce..83e37734f19 100644
--- a/src/crimson/osd/osd_operations/peering_event.cc
+++ b/src/crimson/osd/osd_operations/peering_event.cc
@@ -67,28 +67,27 @@ seastar::future<> PeeringEvent::start()
       on_pg_absent();
       handle.exit();
       return complete_rctx(pg);
-    } else {
-      logger().debug("{}: pg present", *this);
-      return with_blocking_future(handle.enter(pp(*pg).await_map)
-      ).then([this, pg] {
-	return with_blocking_future(
-	  pg->osdmap_gate.wait_for_map(evt.get_epoch_sent()));
-      }).then([this, pg](auto) {
-	return with_blocking_future(handle.enter(pp(*pg).process));
-      }).then([this, pg] {
-        // TODO: likely we should synchronize also with the pg log-based
-        // recovery.
-	return with_blocking_future(
-          handle.enter(BackfillRecovery::bp(*pg).process));
-      }).then([this, pg] {
-	pg->do_peering_event(evt, ctx);
-	handle.exit();
-	return complete_rctx(pg);
-      }).then([this, pg] {
-	return pg->get_need_up_thru() ? shard_services.send_alive(pg->get_same_interval_since())
-                               : seastar::now();
-      });
     }
+    logger().debug("{}: pg present", *this);
+    return with_blocking_future(handle.enter(pp(*pg).await_map)
+    ).then([this, pg] {
+      return with_blocking_future(
+        pg->osdmap_gate.wait_for_map(evt.get_epoch_sent()));
+    }).then([this, pg](auto) {
+      return with_blocking_future(handle.enter(pp(*pg).process));
+    }).then([this, pg] {
+      // TODO: likely we should synchronize also with the pg log-based
+      // recovery.
+      return with_blocking_future(
+        handle.enter(BackfillRecovery::bp(*pg).process));
+    }).then([this, pg] {
+      pg->do_peering_event(evt, ctx);
+      handle.exit();
+      return complete_rctx(pg);
+    }).then([this, pg] {
+      return pg->get_need_up_thru() ? shard_services.send_alive(pg->get_same_interval_since())
+                             : seastar::now();
+    });
   }).then([this] {
     return shard_services.send_pg_temp();
   }).finally([ref=std::move(ref)] {