From 71a083d7c8a48c1dce3ff76359ff5e7937d8366d Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Fri, 5 Dec 2025 11:06:54 +0530 Subject: [PATCH] pg_map: Add a log during removing pg_mapping for testing purpose Signed-off-by: Mohit Agrawal --- src/crimson/osd/pg.cc | 19 ++++++++++++++----- src/crimson/osd/pg_map.cc | 1 + 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index d327aefaa92..fa307ffbda8 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -494,11 +494,20 @@ PG::do_delete_work(ceph::os::Transaction &t, ghobject_t _next) t.remove(coll_ref->get_cid(), pgid.make_snapmapper_oid()); t.remove(coll_ref->get_cid(), pgmeta_oid); t.remove_collection(coll_ref->get_cid()); - (void) shard_services.get_store().do_transaction( - coll_ref, t.claim_and_reset()).then([this] { - return shard_services.remove_pg(pgid); - }); - return {next, false}; + //(void) shard_services.get_store().do_transaction( + // coll_ref, t.claim_and_reset()).then([this] { + // return shard_services.remove_pg(pgid); + //}); + auto chain_fut = shard_services.get_store().do_transaction( + coll_ref, t.claim_and_reset()) + .then([this] { + return shard_services.remove_pg(pgid); + }).then([next] { + return std::make_pair(next, false); + }); + auto interuptible_chain = interruptor::make_interruptible(std::move(chain_fut)); + return interuptible_chain.get(); + //return {next, false}; } else { for (auto &obj : objs_to_rm) { if (obj == pgmeta_oid || obj.is_internal_pg_local()) { diff --git a/src/crimson/osd/pg_map.cc b/src/crimson/osd/pg_map.cc index 13deb67e329..a8ede1f7fe8 100644 --- a/src/crimson/osd/pg_map.cc +++ b/src/crimson/osd/pg_map.cc @@ -144,6 +144,7 @@ seastar::future<> PGShardMapping::remove_pg_mapping(spg_t pgid) { DEBUG("pg {} mapping erased (primary)", pgid); return primary_mapping.container().invoke_on_others( [pgid, FNAME](auto &other_mapping) { + DEBUG("pg {} trying to erased mapping (on others)", pgid); auto find_iter = other_mapping.pg_to_core.find(pgid); if (find_iter == other_mapping.pg_to_core.end()) { ERROR("trying to remove non-exist mapping for pg {} (others)", pgid); -- 2.47.3