From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 14 Sep 2022 11:25:07 +0000 (+0000)
Subject: crimson/osd: PGAdvanceMap ops complete in order
X-Git-Tag: v18.0.0~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1dc9a28e1bbb829266f3cf5710abc8e7c2bec4b;p=ceph.git

crimson/osd: PGAdvanceMap ops complete in order

For the analysis refer to the bug tracker.

Dropping the `handle.exit()` looks like the simplest solution,
far simpler than e.g. introducing extra future-promise.

Fixes: https://tracker.ceph.com/issues/57536
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/pg_advance_map.cc b/src/crimson/osd/osd_operations/pg_advance_map.cc
index 51b279c7edb8..c7fcacb315de 100644
--- a/src/crimson/osd/osd_operations/pg_advance_map.cc
+++ b/src/crimson/osd/osd_operations/pg_advance_map.cc
@@ -74,7 +74,6 @@ seastar::future<> PGAdvanceMap::start()
           });
       }).then([this] {
         pg->handle_activate_map(rctx);
-        handle.exit();
         if (do_init) {
           shard_manager.pg_created(pg->get_pgid(), pg);
           shard_manager.get_shard_services().inc_pg_num();