]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #57469 into main
authorPatrick Donnelly <pdonnell@redhat.com>
Thu, 23 May 2024 01:16:32 +0000 (21:16 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Thu, 23 May 2024 01:16:32 +0000 (21:16 -0400)
* 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>
1  2 
src/mds/MDSDaemon.cc
src/mds/MDSRank.cc
src/mds/MetricAggregator.cc

Simple merge
Simple merge
index 547579169d1fa4feb8e2099be63a1fa881f95bc6,cd9392c98a214b21313af8774235704f7e290143..1d17bbf3e92a11bbdf3bec79ed3a6bd94f574383
@@@ -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();