From: Xuehan Xu <xuxuehan@qianxin.com>
Date: Sat, 31 Aug 2024 05:08:20 +0000 (+0800)
Subject: crimson/osd: more detailed debug logs
X-Git-Tag: v20.0.0~1041^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=73231640d95b872984249cc8848e4e9659087b0f;p=ceph.git

crimson/osd: more detailed debug logs

Signed-off-by: Xuehan Xu <xuxuehan@qianxin.com>
---

diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc
index 8ecb1d4b8ef..12aa40b925a 100644
--- a/src/crimson/osd/object_context_loader.cc
+++ b/src/crimson/osd/object_context_loader.cc
@@ -1,5 +1,6 @@
 #include "crimson/osd/object_context_loader.h"
 #include "osd/osd_types_fmt.h"
+#include "osd/object_state_fmt.h"
 
 SET_SUBSYS(osd);
 
@@ -111,7 +112,7 @@ using crimson::common::local_conf;
 	  return std::invoke(std::move(func), obc);
 	}
       ).finally([FNAME, this, obc=ObjectContextRef(obc)] {
-	DEBUGDPP("released object {}", dpp, obc->get_oid());
+	DEBUGDPP("released object {}, {}", dpp, obc->get_oid(), obc->obs);
 	if constexpr (track) {
 	  obc->remove_from(obc_set_accessing);
 	}
@@ -125,7 +126,7 @@ using crimson::common::local_conf;
 	  return std::invoke(std::move(func), obc);
 	}
       ).finally([FNAME, this, obc=ObjectContextRef(obc)] {
-	DEBUGDPP("released object {}", dpp, obc->get_oid());
+	DEBUGDPP("released object {}, {}", dpp, obc->get_oid(), obc->obs);
 	if constexpr (track) {
 	  obc->remove_from(obc_set_accessing);
 	}
diff --git a/src/crimson/osd/pg_backend.cc b/src/crimson/osd/pg_backend.cc
index 1e4acf95acb..fa8201b61c2 100644
--- a/src/crimson/osd/pg_backend.cc
+++ b/src/crimson/osd/pg_backend.cc
@@ -30,6 +30,7 @@
 #include "replicated_recovery_backend.h"
 #include "ec_backend.h"
 #include "exceptions.h"
+#include "osd/object_state_fmt.h"
 
 namespace {
   seastar::logger& logger() {
@@ -928,6 +929,7 @@ PGBackend::create_iertr::future<> PGBackend::create(
   ceph::os::Transaction& txn,
   object_stat_sum_t& delta_stats)
 {
+  logger().debug("{} obc existed: {}, osd_op {}", __func__, os, osd_op);
   if (os.exists && !os.oi.is_whiteout() &&
       (osd_op.op.flags & CEPH_OSD_OP_FLAG_EXCL)) {
     // this is an exclusive create
diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h
index fe62fad2805..e2edaa39dfc 100644
--- a/src/osd/osd_types.h
+++ b/src/osd/osd_types.h
@@ -4268,6 +4268,7 @@ struct OSDOp {
   }
 };
 std::ostream& operator<<(std::ostream& out, const OSDOp& op);
+template <> struct fmt::formatter<OSDOp> : fmt::ostream_formatter {};
 
 struct pg_log_op_return_item_t {
   int32_t rval;