crimson/os/seastore: replace record_group_data_bytes with data_bytes

Signed-off-by: Myoungwon Oh <myoungwon.oh@samsung.com>

diff --git a/src/crimson/os/seastore/extent_placement_manager.cc b/src/crimson/os/seastore/extent_placement_manager.cc
index c2953fc5cf3b860bd823d8f2852958ee30ed08e8..bcc8ae7eb6449a5857b140ecc9638766da946f56 100644 (file)
--- a/src/crimson/os/seastore/extent_placement_manager.cc
+++ b/src/crimson/os/seastore/extent_placement_manager.cc
@@ -1027,7 +1027,7 @@ RandomBlockOolWriter::do_write(
       auto& trans_stats = get_by_src(w_stats.stats_by_src, t.get_src());
       ++(trans_stats.num_records);
       trans_stats.data_bytes += ex->get_length();
-      w_stats.record_group_data_bytes += ex->get_length();
+      w_stats.data_bytes += ex->get_length();
     }
     return trans_intr::make_interruptible(
       rbm->write(paddr + offset,

diff --git a/src/crimson/os/seastore/journal/record_submitter.cc b/src/crimson/os/seastore/journal/record_submitter.cc
index d7ae299d6995c6868cba04a40d99f56ab3960a84..1e54470ff83bc8c4ac61f64552cdfbf4ffa0b6af 100644 (file)
--- a/src/crimson/os/seastore/journal/record_submitter.cc
+++ b/src/crimson/os/seastore/journal/record_submitter.cc
@@ -411,7 +411,7 @@ RecordSubmitter::open(bool is_mkfs)
         ),
         sm::make_counter(
           "record_group_data_bytes",
-          stats.record_group_data_bytes,
+          stats.data_bytes,
           sm::description("bytes of data when write record groups"),
           label_instances
         ),
@@ -489,7 +489,7 @@ void RecordSubmitter::account_submission(
   stats.record_group_padding_bytes +=
     (rg.size.get_mdlength() - rg.size.get_raw_mdlength());
   stats.record_group_metadata_bytes += rg.size.get_raw_mdlength();
-  stats.record_group_data_bytes += rg.size.dlength;
+  stats.data_bytes += rg.size.dlength;
   stats.record_batch_stats.increment(rg.get_size());
 
   for (const record_t& r : rg.records) {

diff --git a/src/crimson/os/seastore/seastore_types.cc b/src/crimson/os/seastore/seastore_types.cc
index 7699bc373675c0fe4f1551eadf86b08fee7247a1..da5be9e733e44758c9aad859547cf9ce3ebba9c3 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.cc
+++ b/src/crimson/os/seastore/seastore_types.cc
@@ -911,7 +911,7 @@ std::ostream& operator<<(std::ostream& out, const writer_stats_printer_t& p)
       << ",sizeB="
       << fmt::format(dfmt, p.stats.get_total_bytes()/d_num_io)
       << "("
-      << fmt::format(dfmt, p.stats.record_group_data_bytes/d_num_io)
+      << fmt::format(dfmt, p.stats.data_bytes/d_num_io)
       << ","
       << fmt::format(dfmt, p.stats.record_group_metadata_bytes/d_num_io)
       << ","

diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h
index 14ba07b2e0b5a1ba4eeaa43a752cdecc85f536d0..31f074159a202c2c117e695ee5e8b48d09e8ff2b 100644 (file)
--- a/src/crimson/os/seastore/seastore_types.h
+++ b/src/crimson/os/seastore/seastore_types.h
@@ -2330,7 +2330,7 @@ struct writer_stats_t {
   grouped_io_stats io_depth_stats;
   uint64_t record_group_padding_bytes = 0;
   uint64_t record_group_metadata_bytes = 0;
-  uint64_t record_group_data_bytes = 0;
+  uint64_t data_bytes = 0;
   counter_by_src_t<trans_writer_stats_t> stats_by_src;
 
   bool is_empty() const {
@@ -2340,7 +2340,7 @@ struct writer_stats_t {
   uint64_t get_total_bytes() const {
     return record_group_padding_bytes +
            record_group_metadata_bytes +
-           record_group_data_bytes;
+           data_bytes;
   }
 
   void add(const writer_stats_t &o) {
@@ -2348,7 +2348,7 @@ struct writer_stats_t {
     io_depth_stats.add(o.io_depth_stats);
     record_group_padding_bytes += o.record_group_padding_bytes;
     record_group_metadata_bytes += o.record_group_metadata_bytes;
-    record_group_data_bytes += o.record_group_data_bytes;
+    data_bytes += o.data_bytes;
     add_srcs(stats_by_src, o.stats_by_src);
   }
 
@@ -2357,7 +2357,7 @@ struct writer_stats_t {
     io_depth_stats.minus(o.io_depth_stats);
     record_group_padding_bytes -= o.record_group_padding_bytes;
     record_group_metadata_bytes -= o.record_group_metadata_bytes;
-    record_group_data_bytes -= o.record_group_data_bytes;
+    data_bytes -= o.data_bytes;
     minus_srcs(stats_by_src, o.stats_by_src);
   }
 };