From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 23 May 2024 01:16:32 +0000 (-0400)
Subject: Merge PR #57469 into main
X-Git-Tag: v20.0.0~1881
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb10f3df6e5116a020011365579584449ac76f04;p=ceph.git

Merge PR #57469 into main

* refs/pull/57469/head:
	mds: set dispatcher order
	mds: use regular dispatch for processing beacons
	msg: add priority to dispatcher invocation order
	mds: note when dispatcher is called

Reviewed-by: Leonid Usov <leonid.usov@ibm.com>
---

eb10f3df6e5116a020011365579584449ac76f04
diff --cc src/mds/MetricAggregator.cc
index 547579169d1,cd9392c98a2..1d17bbf3e92
--- a/src/mds/MetricAggregator.cc
+++ b/src/mds/MetricAggregator.cc
@@@ -126,7 -126,17 +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();