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

Signed-off-by: Venky Shankar <[email protected]>

Author: vshankar

src/mds/MetricAggregator.cc

@@ -697,8 +697,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);
@@ -723,7 +725,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) {

src/messages/MMDSMetrics.h

@@ -31,7 +31,8 @@ class MMDSMetrics final : public MMDSOp {
 
   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 {