Merge PR ceph#60653 into main

* refs/pull/60653/head: mds: do not process client metrics message with fast dispatch Reviewed-by: Patrick Donnelly <[email protected]> Reviewed-by: Jos Collin <[email protected]> Reviewed-by: Dhairya Parmar <[email protected]>
cybozu · Dec 26, 2024 · afcd6a7 · afcd6a7
2 parents 7870d7f + ba0d989
commit afcd6a7
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc
@@ -20,15 +20,6 @@ MetricsHandler::MetricsHandler(CephContext *cct, MDSRank *mds)
     mds(mds) {
 }
 
-bool MetricsHandler::ms_can_fast_dispatch2(const cref_t<Message> &m) const {
-  return m->get_type() == CEPH_MSG_CLIENT_METRICS || m->get_type() == MSG_MDS_PING;
-}
-
-void MetricsHandler::ms_fast_dispatch2(const ref_t<Message> &m) {
-  bool handled = ms_dispatch2(m);
-  ceph_assert(handled);
-}
-
 bool MetricsHandler::ms_dispatch2(const ref_t<Message> &m) {
   if (m->get_type() == CEPH_MSG_CLIENT_METRICS &&
       m->get_connection()->get_peer_type() == CEPH_ENTITY_TYPE_CLIENT) {

diff --git a/src/mds/MetricsHandler.h b/src/mds/MetricsHandler.h
@@ -25,11 +25,6 @@ class MetricsHandler : public Dispatcher {
 public:
   MetricsHandler(CephContext *cct, MDSRank *mds);
 
-  bool ms_can_fast_dispatch_any() const override {
-    return true;
-  }
-  bool ms_can_fast_dispatch2(const cref_t<Message> &m) const override;
-  void ms_fast_dispatch2(const ref_t<Message> &m) override;
   bool ms_dispatch2(const ref_t<Message> &m) override;
 
   void ms_handle_connect(Connection *c) override {