From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Mon, 12 Jul 2021 08:11:26 +0000 (+0800)
Subject: crimson/os/seastore/cache: improve logs for transaction conflict/reset
X-Git-Tag: v17.1.0~1410^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=127ee8f61ed9c0a3ad942f0d8f19c6b87270b8b8;p=ceph.git

crimson/os/seastore/cache: improve logs for transaction conflict/reset

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/crimson/os/seastore/cache.cc b/src/crimson/os/seastore/cache.cc
index fdf88d9f27bf9..f0929fd276c39 100644
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -351,7 +351,7 @@ void Cache::invalidate(CachedExtent &extent) {
   DEBUG("invalidate begin -- extent {}", extent);
   for (auto &&i: extent.transactions) {
     if (!i.t->conflicted) {
-      DEBUGT("", i.t);
+      DEBUGT("set conflict", *i.t);
       i.t->conflicted = true;
       assert(!i.t->is_weak());
       auto m_key = std::make_pair(i.t->get_src(), extent.get_type());
diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h
index 452fff7dccb12..19432f429020b 100644
--- a/src/crimson/os/seastore/cache.h
+++ b/src/crimson/os/seastore/cache.h
@@ -134,10 +134,12 @@ public:
 
   /// Resets transaction preserving
   void reset_transaction_preserve_handle(Transaction &t) {
+    LOG_PREFIX(Cache::reset_transaction_preserve_handle);
     if (t.did_reset()) {
       ++(get_counter(stats.trans_created_by_src, t.get_src()));
     }
     t.reset_preserve_handle(last_commit);
+    DEBUGT("reset", t);
   }
 
   /**