From: Xiubo Li <xiubli@redhat.com>
Date: Wed, 17 Jul 2024 07:29:50 +0000 (+0800)
Subject: Merge pull request #57678 from batrick/wip-66188-squid
X-Git-Tag: v19.1.1~101
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=929494cc71991b361ede322448c60fb939d3a1f1;p=ceph.git

Merge pull request #57678 from batrick/wip-66188-squid

squid: mds: use regular dispatch for processing metrics
---

929494cc71991b361ede322448c60fb939d3a1f1
diff --cc src/mds/MetricAggregator.cc
index 0ae8d2d1b95b,d8bfdc4e7d05..6cdc3ab193e9
--- a/src/mds/MetricAggregator.cc
+++ b/src/mds/MetricAggregator.cc
@@@ -126,17 -126,7 +126,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();