From 60cd6d117163ffc635ebe9577bf4748d757efcee Mon Sep 17 00:00:00 2001 From: Leonid Usov Date: Thu, 8 Feb 2024 14:06:30 +0200 Subject: [PATCH] mds: MDSRank.cc: return status from `send_message_mds` Signed-off-by: Leonid Usov --- src/mds/MDSRank.cc | 12 ++++++------ src/mds/MDSRank.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 6f8439470a655..9cedeea1b1360 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -1450,15 +1450,15 @@ private: }; -void MDSRank::send_message_mds(const ref_t& m, mds_rank_t mds) +int MDSRank::send_message_mds(const ref_t& m, mds_rank_t mds) { if (!mdsmap->is_up(mds)) { dout(10) << "send_message_mds mds." << mds << " not up, dropping " << *m << dendl; - return; + return ENOENT; } else if (mdsmap->is_bootstrapping(mds)) { dout(5) << __func__ << "mds." << mds << " is bootstrapping, deferring " << *m << dendl; wait_for_bootstrapped_peer(mds, new C_MDS_RetrySendMessageMDS(this, mds, m)); - return; + return 0; } // send mdsmap first? @@ -1470,12 +1470,12 @@ void MDSRank::send_message_mds(const ref_t& m, mds_rank_t mds) } // send message - send_message_mds(m, addrs); + return send_message_mds(m, addrs); } -void MDSRank::send_message_mds(const ref_t& m, const entity_addrvec_t &addr) +int MDSRank::send_message_mds(const ref_t& m, const entity_addrvec_t &addr) { - messenger->send_to_mds(ref_t(m).detach(), addr); + return messenger->send_to_mds(ref_t(m).detach(), addr); } void MDSRank::forward_message_mds(const MDRequestRef& mdr, mds_rank_t mds) diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h index adebb9b4d08da..f8e186b56c733 100644 --- a/src/mds/MDSRank.h +++ b/src/mds/MDSRank.h @@ -309,8 +309,8 @@ class MDSRank { double get_dispatch_queue_max_age(utime_t now) const; - void send_message_mds(const ref_t& m, mds_rank_t mds); - void send_message_mds(const ref_t& m, const entity_addrvec_t &addr); + int send_message_mds(const ref_t& m, mds_rank_t mds); + int send_message_mds(const ref_t& m, const entity_addrvec_t &addr); void forward_message_mds(const MDRequestRef& mdr, mds_rank_t mds); void send_message_client_counted(const ref_t& m, client_t client); void send_message_client_counted(const ref_t& m, Session* session); -- 2.39.5