From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Tue, 31 Aug 2021 05:26:09 +0000 (+0800)
Subject: crimson/os/seastore: drop Transaction::src_t::INIT category from metrics
X-Git-Tag: v17.1.0~980^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49449adcc1db67793bd90ea5184ec709518e88cb;p=ceph-ci.git

crimson/os/seastore: drop Transaction::src_t::INIT category from metrics

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 24eddfb2643..185e34a8415 100644
--- a/src/crimson/os/seastore/cache.cc
+++ b/src/crimson/os/seastore/cache.cc
@@ -103,7 +103,6 @@ void Cache::register_metrics()
   std::map<src_t, sm::label_instance> labels_by_src {
     {src_t::MUTATE,  src_label("MUTATE")},
     {src_t::READ,    src_label("READ")},
-    {src_t::INIT,    src_label("INIT")},
     {src_t::CLEANER, src_label("CLEANER")},
   };
 
diff --git a/src/crimson/os/seastore/transaction.h b/src/crimson/os/seastore/transaction.h
index 31197982756..2bde9b11b8e 100644
--- a/src/crimson/os/seastore/transaction.h
+++ b/src/crimson/os/seastore/transaction.h
@@ -142,11 +142,8 @@ public:
   }
 
   enum class src_t : uint8_t {
-    // normal IO operations at seastore boundary or within a test
     MUTATE = 0,
-    READ,
-    // transaction manager level operations
-    INIT,
+    READ, // including weak and non-weak read transactions
     CLEANER,
     MAX
   };
@@ -282,8 +279,6 @@ inline std::ostream& operator<<(std::ostream& os,
     return os << "MUTATE";
   case Transaction::src_t::READ:
     return os << "READ";
-  case Transaction::src_t::INIT:
-    return os << "INIT";
   case Transaction::src_t::CLEANER:
     return os << "CLEANER";
   default:
diff --git a/src/crimson/os/seastore/transaction_manager.cc b/src/crimson/os/seastore/transaction_manager.cc
index d6fc4a11bd3..eee1d2aedd5 100644
--- a/src/crimson/os/seastore/transaction_manager.cc
+++ b/src/crimson/os/seastore/transaction_manager.cc
@@ -36,7 +36,7 @@ TransactionManager::mkfs_ertr::future<> TransactionManager::mkfs()
     DEBUG("about to do_with");
     segment_cleaner->init_mkfs(addr);
     return with_transaction_intr(
-        Transaction::src_t::INIT, [this, FNAME](auto& t) {
+        Transaction::src_t::MUTATE, [this, FNAME](auto& t) {
       DEBUGT("about to cache->mkfs", t);
       cache->init();
       return cache->mkfs(t
@@ -70,7 +70,7 @@ TransactionManager::mount_ertr::future<> TransactionManager::mount()
   }).safe_then([this, FNAME](auto addr) {
     segment_cleaner->set_journal_head(addr);
     return seastar::do_with(
-      create_weak_transaction(Transaction::src_t::INIT),
+      create_weak_transaction(Transaction::src_t::READ),
       [this, FNAME](auto &tref) {
 	return with_trans_intr(
 	  *tref,