pg_map: Add a log during removing pg_mapping for testing purpose

Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index d327aefaa925436af0e796c00dd99d1e27196998..fa307ffbda822e2bac2ed7e66d167d7e4919b248 100644 (file)
--- 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 13deb67e3295486e327a625fef9c6e0672452476..a8ede1f7fe84763cd92628cbf76463edbb6bbd8e 100644 (file)
--- 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);