src/crimson/osd/pg: Add DEBUG logging to do_delete_work

Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index d327aefaa925436af0e796c00dd99d1e27196998..59f5ff7c764ec49d31921fea03f234c394bda909 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -480,7 +480,8 @@ void PG::prepare_write(pg_info_t &info,
 std::pair<ghobject_t, bool>
 PG::do_delete_work(ceph::os::Transaction &t, ghobject_t _next)
 {
-  logger().info("removing pg {}", pgid);
+  LOG_PREFIX(PG::do_delete_work);
+  DEBUGDPP("removing pg {}", *this, pgid);
   auto fut = interruptor::make_interruptible(
     shard_services.get_store().list_objects(
       coll_ref,
@@ -490,7 +491,7 @@ PG::do_delete_work(ceph::os::Transaction &t, ghobject_t _next)
 
   auto [objs_to_rm, next] = fut.get();
   if (objs_to_rm.empty()) {
-    logger().info("all objs removed, removing coll for {}", pgid);
+    DEBUGDPP("all objs removed, removing coll for {}", *this, pgid);
     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());
@@ -500,17 +501,19 @@ PG::do_delete_work(ceph::os::Transaction &t, ghobject_t _next)
     });
     return {next, false};
   } else {
+    DEBUGDPP("pg {}, removing {} objects in this batch",
+        *this, pgid, objs_to_rm.size());
     for (auto &obj : objs_to_rm) {
       if (obj == pgmeta_oid || obj.is_internal_pg_local()) {
         continue;
       }
-      logger().trace("pg {}, removing obj {}", pgid, obj);
+      TRACEDPP("pg {}, removing obj {}", *this, pgid, obj);
       t.remove(coll_ref->get_cid(), obj);
     }
     t.register_on_commit(
-      new LambdaContext([this](int r) {
+      new LambdaContext([this, FNAME](int r) {
       ceph_assert(r == 0);
-      logger().trace("triggering more pg delete {}", pgid);
+      DEBUGDPP("triggering more pg delete {}", *this, pgid);
       (void) shard_services.start_operation<LocalPeeringEvent>(
         this,
         pg_whoami,