From 52fac5eb7595576091a8b62a7a800d5940628d4f Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 28 Jul 2018 18:21:34 -0700 Subject: [PATCH] mds: remove dead MDS-MDS forwarding code Signed-off-by: Patrick Donnelly --- src/mds/MDSRank.cc | 11 +--------- src/mds/MDSRank.h | 2 -- src/messages/MDirUpdate.h | 19 +++++------------- src/messages/MInterMDS.h | 42 --------------------------------------- 4 files changed, 6 insertions(+), 68 deletions(-) delete mode 100644 src/messages/MInterMDS.h diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index e24fa335bd8af..cc78d3c3d0bd3 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -964,19 +964,10 @@ void MDSRank::forward_message_mds(const MClientRequest::const_ref& m, mds_rank_t bool client_must_resend = true; //!creq->can_forward(); // tell the client where it should go - auto f = MClientRequestForward::ref(new MClientRequestForward(m->get_tid(), mds, m->get_num_fwd()+1, client_must_resend), false); + MClientRequestForward::ref f(new MClientRequestForward(m->get_tid(), mds, m->get_num_fwd()+1, client_must_resend), false); messenger->send_message(f.detach(), m->get_source_inst()); } -void MDSRank::forward_message_mds(const MInterMDS::const_ref& m, mds_rank_t mds) -{ - assert(mds != whoami); - - if (m->is_forwardable()) { - send_message_mds(m->forwardable(), mds); - } -} - void MDSRank::send_message_client_counted(const Message::ref& m, client_t client) { Session *session = sessionmap.get_session(entity_name_t::CLIENT(client.v)); diff --git a/src/mds/MDSRank.h b/src/mds/MDSRank.h index 5366f2eafafa8..49f05ea77f0b8 100644 --- a/src/mds/MDSRank.h +++ b/src/mds/MDSRank.h @@ -23,7 +23,6 @@ #include "common/TrackedOp.h" #include "messages/MClientRequest.h" -#include "messages/MInterMDS.h" #include "messages/MCommand.h" #include "messages/MMDSMap.h" @@ -377,7 +376,6 @@ class MDSRank { send_message_mds(mr, mds); } void forward_message_mds(const MClientRequest::const_ref& req, mds_rank_t mds); - void forward_message_mds(const MInterMDS::const_ref& req, mds_rank_t mds); void send_message_client_counted(const Message::ref& m, client_t client); void send_message_client_counted(Message* m, client_t client) { diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h index a35de0b8db21b..d15f24e1ef180 100644 --- a/src/messages/MDirUpdate.h +++ b/src/messages/MDirUpdate.h @@ -16,20 +16,20 @@ #ifndef CEPH_MDIRUPDATE_H #define CEPH_MDIRUPDATE_H -#include "MInterMDS.h" +#include "msg/Message.h" -class MDirUpdate : public MInterMDS { +class MDirUpdate : public Message { public: typedef boost::intrusive_ptr ref; typedef boost::intrusive_ptr const_ref; - MDirUpdate() : MInterMDS(MSG_MDS_DIRUPDATE) {} + MDirUpdate() : Message(MSG_MDS_DIRUPDATE) {} MDirUpdate(mds_rank_t f, dirfrag_t dirfrag, int dir_rep, const std::set& dir_rep_by, filepath& path, bool discover = false) : - MInterMDS(MSG_MDS_DIRUPDATE), from_mds(f), dirfrag(dirfrag), + Message(MSG_MDS_DIRUPDATE), from_mds(f), dirfrag(dirfrag), dir_rep(dir_rep), dir_rep_by(dir_rep_by), path(path) { this->discover = discover ? 5 : 0; } @@ -69,19 +69,10 @@ public: encode(path, payload); } - bool is_forwardable() const override { - return true; - } - - MInterMDS::ref forwardable() const override { - MDirUpdate::ref m(new MDirUpdate(*this), false); - return m; - } - protected: ~MDirUpdate() {} MDirUpdate(const MDirUpdate& m) - : MInterMDS(MSG_MDS_DIRUPDATE), + : Message(MSG_MDS_DIRUPDATE), from_mds(m.from_mds), dirfrag(m.dirfrag), dir_rep(m.dir_rep), diff --git a/src/messages/MInterMDS.h b/src/messages/MInterMDS.h deleted file mode 100644 index fecd737401fe9..0000000000000 --- a/src/messages/MInterMDS.h +++ /dev/null @@ -1,42 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab -/* - * Ceph - scalable distributed file system - * - * Copyright (c) 2018 Red Hat, Inc. - * - * This is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software - * Foundation. See file COPYING. - * - */ - - -#ifndef CEPH_MINTERMDS_H -#define CEPH_MINTERMDS_H - -#include "include/types.h" -#include "include/fs_types.h" - -#include "msg/Message.h" - -class MInterMDS : public Message { -public: - typedef boost::intrusive_ptr ref; - typedef boost::intrusive_ptr const_ref; - - template - MInterMDS(T&&... args) : Message(std::forward(args)...) {} - - virtual bool is_forwardable() const { return false; } - - // N.B. only some types of messages we should be 'forwarding'; they - // explicitly encode their source mds, which gets clobbered when resent - virtual MInterMDS::ref forwardable() const {ceph_abort();} - -protected: - virtual ~MInterMDS() {} -}; - -#endif -- 2.39.5