From: Venky Shankar <vshankar@redhat.com>
Date: Sun, 5 Jan 2025 14:02:48 +0000 (+0530)
Subject: Merge PR #57679 into wip-vshankar-testing-20250105.140222-quincy-debug
X-Git-Tag: testing/wip-vshankar-testing-20250105.140222-quincy-debug~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cc6fd770484fa4c5625fd9760674e5e81bd9b47;p=ceph-ci.git

Merge PR #57679 into wip-vshankar-testing-20250105.140222-quincy-debug

* refs/pull/57679/head:
---

5cc6fd770484fa4c5625fd9760674e5e81bd9b47
diff --cc src/mds/MetricAggregator.cc
index e1f0c11bca2,c48dc6a0fd1..15f088a2c22
--- a/src/mds/MetricAggregator.cc
+++ b/src/mds/MetricAggregator.cc
@@@ -68,17 -68,7 +68,8 @@@ void MetricAggregator::shutdown() 
    }
  }
  
- bool MetricAggregator::ms_can_fast_dispatch2(const cref_t<Message> &m) const {
-   return m->get_type() == MSG_MDS_METRICS;
- }
- 
- void MetricAggregator::ms_fast_dispatch2(const ref_t<Message> &m) {
-   bool handled = ms_dispatch2(m);
-   ceph_assert(handled);
- }
- 
  bool MetricAggregator::ms_dispatch2(const ref_t<Message> &m) {
 +  dout(25) << " processing " << m << dendl;
    if (m->get_type() == MSG_MDS_METRICS &&
        m->get_connection()->get_peer_type() == CEPH_ENTITY_TYPE_MDS) {
      const Message *msg = m.get();