mds: do not process client metrics message with fast dispatch

So that the MDS can transition faster to up:active without
spending much time in processing metrics message during reconnect.

Fixes: http://tracker.ceph.com/issues/68865
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit ba0d989f9c963b6b8e0e2db474e97b9e00f4616d)

diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc
index 9ad10b9d6e62e873a960ca126343745b963a33e2..833d7ef19984c0bd97e95fda3f38694a262e7ed2 100644 (file)
--- 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
index 0b75b0248607703bdb92d0e5bf17e9b352436525..25ee208aa956226467da27e4294667589a7cfb01 100644 (file)
--- 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 {