mds, messages: include subvolume metric count in log dumps and message exchanges

Resolves: ISCE-2037

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

diff --git a/src/mds/MetricAggregator.cc b/src/mds/MetricAggregator.cc
index 6ab4096f4669b481e7d028d5d7f345faf20b14e8..fb9c28a593024771e87e7bcc176aa9989e877f13 100644 (file)
--- a/src/mds/MetricAggregator.cc
+++ b/src/mds/MetricAggregator.cc
@@ -709,8 +709,10 @@ void MetricAggregator::handle_mds_metrics(const cref_t<MMDSMetrics> &m) {
   auto seq = metrics_message.seq;
   auto rank = metrics_message.rank;
   auto &client_metrics_map = metrics_message.client_metrics_map;
+  auto &subvolume_metrics = metrics_message.subvolume_metrics;
 
-  dout(20) << ": applying " << client_metrics_map.size() << " updates for rank="
+  dout(20) << ": applying " << client_metrics_map.size() << "+"
+          << subvolume_metrics.size() << " updates for rank="
            << rank << " with sequence number " << seq << dendl;
 
   std::scoped_lock locker(lock);
@@ -735,7 +737,7 @@ void MetricAggregator::handle_mds_metrics(const cref_t<MMDSMetrics> &m) {
     }
   }
 
-  refresh_subvolume_metrics_for_rank(rank, metrics_message.subvolume_metrics);
+  refresh_subvolume_metrics_for_rank(rank, subvolume_metrics);
 }
 
 void MetricAggregator::cull_metrics_for_rank(mds_rank_t rank) {

diff --git a/src/messages/MMDSMetrics.h b/src/messages/MMDSMetrics.h
index 4a8e036eb0a77d5257c9d62912f3ae067d78b9b1..724ac90b0025f2455c2d0ea93cfd01c76718167f 100644 (file)
--- a/src/messages/MMDSMetrics.h
+++ b/src/messages/MMDSMetrics.h
@@ -31,7 +31,8 @@ public:
 
   void print(std::ostream &out) const override {
     out << "mds_metrics from rank=" << metrics_message.rank << " carrying "
-        << metrics_message.client_metrics_map.size() << " metric updates";
+        << metrics_message.client_metrics_map.size() << "+"
+       << metrics_message.subvolume_metrics.size() << " metric updates";
   }
 
   void encode_payload(uint64_t features) override {