]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: squeeze one indentation level from PeeringEvent::start().
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 4 Oct 2021 14:35:30 +0000 (14:35 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 7 Oct 2021 11:33:18 +0000 (11:33 +0000)
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/osd_operations/peering_event.cc

index 7299c9421ce78d863bb70f8c08856d5107cfbb26..83e37734f198c3ff927e1965c83006751c51bcf1 100644 (file)
@@ -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)] {