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 8ecb1d4b8efbcf9544e0a10cd8667a7725ba6f7b..12aa40b925aea62e746872766ea2d9a645323748 100644 (file)
--- 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 1e4acf95acbc9c0d541c99887bebc09172be3633..fa8201b61c28d3c36e5130144e621d09a7b77171 100644 (file)
--- 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 fe62fad2805d3d31feb22a7e7221bf76a6f90217..e2edaa39dfc2dd7a263d226ab951fbaed6e604ed 100644 (file)
--- 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;