From: Yingxin Cheng <yingxin.cheng@intel.com>
Date: Fri, 17 May 2024 09:05:57 +0000 (+0800)
Subject: crimson/os/seastore/../record_submitter: drop a duplicated metric
X-Git-Tag: v19.1.1~213^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b965448b80c33e44eb5709a09d602c6cb4f73e24;p=ceph.git

crimson/os/seastore/../record_submitter: drop a duplicated metric

The original "record group num" is identical to "io num".

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
(cherry picked from commit f1e7ca6f9c18d05726ff6beed871152849d6c9a4)
---

diff --git a/src/crimson/os/seastore/journal/record_submitter.cc b/src/crimson/os/seastore/journal/record_submitter.cc
index 418a453aac7d..7fe64d90b387 100644
--- a/src/crimson/os/seastore/journal/record_submitter.cc
+++ b/src/crimson/os/seastore/journal/record_submitter.cc
@@ -293,6 +293,8 @@ RecordSubmitter::submit(
     auto block_size = journal_allocator.get_block_size();
     auto rg = record_group_t(std::move(record), block_size);
     account_submission(rg);
+    assert(stats.record_batch_stats.num_io ==
+           stats.io_depth_stats.num_io);
     record_group_size_t sizes = rg.size;
     auto to_write = p_current_batch->submit_pending_fast(
       std::move(rg),
@@ -370,14 +372,8 @@ RecordSubmitter::open(bool is_mkfs)
       {
         sm::make_counter(
           "record_num",
-          stats.record_batch_stats.num_io,
-          sm::description("total number of records submitted"),
-          label_instances
-        ),
-        sm::make_counter(
-          "record_batch_num",
           stats.record_batch_stats.num_io_grouped,
-          sm::description("total number of records batched"),
+          sm::description("total number of records submitted"),
           label_instances
         ),
         sm::make_counter(
@@ -512,6 +508,8 @@ void RecordSubmitter::flush_current_batch()
   assert(rg.get_size() == num);
   record_group_size_t sizes = rg.size;
   account_submission(rg);
+  assert(stats.record_batch_stats.num_io ==
+         stats.io_depth_stats.num_io);
   auto to_write = p_batch->encode_batch(
     get_committed_to(), journal_allocator.get_nonce());
   // Note: rg is cleared