From: Venky Shankar <vshankar@redhat.com>
Date: Fri, 29 Aug 2025 17:56:21 +0000 (+0000)
Subject: mds: remove unneeded SubvolumeMetric field from `struct Metric`
X-Git-Tag: testing/wip-pdonnell-testing-20260323.122957-tentacle~533
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=496bd58432358959d23e09dd6a66f4cc63d1ea14;p=ceph-ci.git

mds: remove unneeded SubvolumeMetric field from `struct Metric`

Resolves: ISCE-2037

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 4d2ad699fb59d63143b89faecc7046f1db2dfe12)
(cherry picked from commit 6a1a10e3d94ac78e1444b38408ade8a20d420420)

 Conflicts:
	src/mds/MDSPerfMetricTypes.h

Reverse adjust back to decode version 5 since this commit remove unneeded
subvolume_metrics from Metrics structure.
---

diff --git a/src/mds/MDSPerfMetricTypes.h b/src/mds/MDSPerfMetricTypes.h
index d444c087422..32864caf89a 100644
--- a/src/mds/MDSPerfMetricTypes.h
+++ b/src/mds/MDSPerfMetricTypes.h
@@ -338,13 +338,12 @@ struct Metrics {
   ReadIoSizesMetric read_io_sizes_metric;
   WriteIoSizesMetric write_io_sizes_metric;
   CopyIoSizesMetric copy_io_sizes_metric;
-  SubvolumeMetric subvolume_metrics;
 
   // metric update type
   uint32_t update_type = UpdateType::UPDATE_TYPE_REFRESH;
 
   DENC(Metrics, v, p) {
-    DENC_START(6, 1, p);
+    DENC_START(5, 1, p);
     denc(v.update_type, p);
     denc(v.cap_hit_metric, p);
     denc(v.read_latency_metric, p);
@@ -365,10 +364,6 @@ struct Metrics {
     if (struct_v >= 5) {
       denc(v.copy_io_sizes_metric, p);
     }
-    if (struct_v >= 6) {
-      denc(v.subvolume_metrics, p);
-    }
-
     DENC_FINISH(p);
   }
 
@@ -385,7 +380,6 @@ struct Metrics {
     f->dump_object("read_io_sizes_metric", read_io_sizes_metric);
     f->dump_object("write_io_sizes_metric", write_io_sizes_metric);
     f->dump_object("copy_io_sizes_metric", copy_io_sizes_metric);
-    f->dump_object("subvolume_metrics", subvolume_metrics);
   }
 
   friend std::ostream& operator<<(std::ostream& os, const Metrics& metrics) {
@@ -401,7 +395,6 @@ struct Metrics {
        << ", read_io_sizes_metric=" << metrics.read_io_sizes_metric
        << ", write_io_sizes_metric=" << metrics.write_io_sizes_metric
        << ", copy_io_sizes_metric=" << metrics.copy_io_sizes_metric
-       << ", subvolume_metrics=" << metrics.subvolume_metrics
        << "}]";
     return os;
   }