From ba0d989f9c963b6b8e0e2db474e97b9e00f4616d Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Thu, 7 Nov 2024 05:17:13 +0000 Subject: [PATCH] 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 --- src/mds/MetricsHandler.cc | 9 --------- src/mds/MetricsHandler.h | 5 ----- 2 files changed, 14 deletions(-) diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc index 9ad10b9d6e62e..833d7ef19984c 100644 --- 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 &m) const { - return m->get_type() == CEPH_MSG_CLIENT_METRICS || m->get_type() == MSG_MDS_PING; -} - -void MetricsHandler::ms_fast_dispatch2(const ref_t &m) { - bool handled = ms_dispatch2(m); - ceph_assert(handled); -} - bool MetricsHandler::ms_dispatch2(const ref_t &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 0b75b02486077..25ee208aa9562 100644 --- 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 &m) const override; - void ms_fast_dispatch2(const ref_t &m) override; bool ms_dispatch2(const ref_t &m) override; void ms_handle_connect(Connection *c) override { -- 2.39.5