msgr: kill per-msg protocol version values

diff --git a/src/include/msgr.h b/src/include/msgr.h
index b17f0a9306536ee9f230b6c770a8be09bf61cb08..8e9fc934186a4c85b1028903bf8a547641d5eac1 100644 (file)
--- a/src/include/msgr.h
+++ b/src/include/msgr.h
@@ -132,10 +132,6 @@ struct ceph_msg_header {
        __le16 data_off;  /* sender: include full offset;
                             receiver: mask against ~PAGE_MASK */
 
-       __u8 mon_protocol, monc_protocol;  /* protocol versions, */
-       __u8 osd_protocol, osdc_protocol;  /* internal and public */
-       __u8 mds_protocol, mdsc_protocol;
-
        struct ceph_entity_inst src, orig_src;
        __le32 dst_erank;
        __le32 crc;       /* header crc32c */

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 1cda0d9282630180c53a210b71a28a250f925e27..2f555c7d1d710e6436d0b5cd824fda54147eada8 100644 (file)
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -1728,12 +1728,6 @@ struct ceph_msg *ceph_msg_new(int type, int front_len,
        m->hdr.data_len = cpu_to_le32(page_len);
        m->hdr.data_off = cpu_to_le16(page_off);
        m->hdr.priority = cpu_to_le16(CEPH_MSG_PRIO_DEFAULT);
-       m->hdr.mon_protocol = CEPH_MON_PROTOCOL;
-       m->hdr.monc_protocol = CEPH_MONC_PROTOCOL;
-       m->hdr.osd_protocol = CEPH_OSD_PROTOCOL;
-       m->hdr.osdc_protocol = CEPH_OSDC_PROTOCOL;
-       m->hdr.mds_protocol = CEPH_MDS_PROTOCOL;
-       m->hdr.mdsc_protocol = CEPH_MDSC_PROTOCOL;
        m->footer.front_crc = 0;
        m->footer.middle_crc = 0;
        m->footer.data_crc = 0;

diff --git a/src/librados.cc b/src/librados.cc
index 6544319c92a515fba867b18bf758261795e4772b..56334ab1673a505d8975a263fdac776858a632a2 100644 (file)
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -338,25 +338,8 @@ RadosClient::~RadosClient()
 
 bool RadosClient::ms_dispatch(Message *m)
 {
-  bool ret;
-
-  if (m->get_orig_source().is_mon() &&
-      m->get_header().monc_protocol != CEPH_MONC_PROTOCOL) {
-    dout(0) << "monc protocol v " << (int)m->get_header().monc_protocol << " != my " << CEPH_MONC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-  if (m->get_orig_source().is_osd() &&
-      m->get_header().osdc_protocol != CEPH_OSDC_PROTOCOL) {
-    dout(0) << "osdc protocol v " << (int)m->get_header().osdc_protocol << " != my " << CEPH_OSDC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-
   lock.Lock();
-  ret = _dispatch(m);
+  bool ret = _dispatch(m);
   lock.Unlock();
   return ret;
 }

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index f5eb963ba1ec2266dcf7411131742fad27f6269d..97953a3466938ba4d65c45ffb1aafc639e1cb1ef 100644 (file)
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1155,47 +1155,9 @@ void MDS::suicide()
 
 bool MDS::ms_dispatch(Message *m)
 {
-  bool ret;
-
-  // verify protocol version
-  if (m->get_orig_source().is_mds() &&
-      m->get_header().mds_protocol != CEPH_MDS_PROTOCOL) {
-    dout(0) << "mds protocol v " << (int)m->get_header().mds_protocol << " != my " << CEPH_MDS_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-
-  if (m->get_header().mdsc_protocol != CEPH_MDSC_PROTOCOL) {
-    dout(0) << "mdsc protocol v " << (int)m->get_header().mdsc_protocol << " != my " << CEPH_MDSC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-  if (m->get_orig_source().is_mon() &&
-      m->get_header().monc_protocol != CEPH_MONC_PROTOCOL) {
-    dout(0) << "monc protocol v " << (int)m->get_header().monc_protocol << " != my " << CEPH_MONC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-  if (m->get_orig_source().is_osd() &&
-      m->get_header().osdc_protocol != CEPH_OSDC_PROTOCOL) {
-    dout(0) << "osdc protocol v " << (int)m->get_header().osdc_protocol << " != my " << CEPH_OSDC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-
-  if (m->get_type() == CEPH_MSG_PING) {
-    delete m;
-    return true;
-  }    
-
   mds_lock.Lock();
-  ret = _dispatch(m);
+  bool ret = _dispatch(m);
   mds_lock.Unlock();
-
   return ret;
 }
 

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 89e6694cd49357ff7836a9627086dc60074cf6b6..9bedd6949af024042fd0facdcf804cd731f66e8c 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -356,31 +356,6 @@ void Monitor::stop_cluster()
 
 bool Monitor::ms_dispatch(Message *m)
 {
-  // verify protocol version
-  if (m->get_orig_source().is_mon() &&
-      m->get_header().mon_protocol != CEPH_MON_PROTOCOL) {
-    dout(0) << "mon protocol v " << (int)m->get_header().mon_protocol << " != my " << CEPH_MON_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-  if (m->get_header().monc_protocol != CEPH_MONC_PROTOCOL) {
-    dout(0) << "monc protocol v " << (int)m->get_header().monc_protocol << " != my " << CEPH_MONC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-
-    if (m->get_type() == CEPH_MSG_CLIENT_MOUNT) {
-      stringstream ss;
-      ss << "client protocol v " << (int)m->get_header().monc_protocol << " != server v " << CEPH_MONC_PROTOCOL;
-      string s;
-      getline(ss, s);
-      messenger->send_message(new MClientMountAck(-1, -EINVAL, s.c_str()),
-                             m->get_orig_source_inst());
-    }
-
-    delete m;
-    return true;
-  }
-
   lock.Lock();
   {
     switch (m->get_type()) {

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 0cf00aae24b9492618b75502a8bfe632c1d07575..ceda59f836c5f9de373a1b659859ac8cbe7bdeb2 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -2133,13 +2133,6 @@ void SimpleMessenger::submit_message(Message *m, const entity_inst_t& dest, bool
 
   assert(m->nref.test() == 0);
 
-  m->get_header().mon_protocol = CEPH_MON_PROTOCOL;
-  m->get_header().monc_protocol = CEPH_MONC_PROTOCOL;
-  m->get_header().mds_protocol = CEPH_MDS_PROTOCOL;
-  m->get_header().mdsc_protocol = CEPH_MDSC_PROTOCOL;
-  m->get_header().osd_protocol = CEPH_OSD_PROTOCOL;
-  m->get_header().osdc_protocol = CEPH_OSDC_PROTOCOL;
-
   // lookup
   entity_addr_t dest_proc_addr = dest_addr;
   dest_proc_addr.erank = 0;

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f22033373d040fa80e19f0d08518f94d8e917c55..62cbd8e9c2afc4374f27c33b50ee6a6dee3c9240 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1483,29 +1483,6 @@ bool OSD::heartbeat_dispatch(Message *m)
 
 bool OSD::ms_dispatch(Message *m)
 {
-  // verify protocol version
-  if (m->get_orig_source().is_osd() &&
-      m->get_header().osd_protocol != CEPH_OSD_PROTOCOL) {
-    dout(0) << "osd protocol v " << (int)m->get_header().osd_protocol << " != my " << CEPH_OSD_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-
-  if (m->get_header().osdc_protocol != CEPH_OSDC_PROTOCOL) {
-    dout(0) << "osdc protocol v " << (int)m->get_header().osdc_protocol << " != my " << CEPH_OSDC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-  if (m->get_orig_source().is_mon() &&
-      m->get_header().monc_protocol != CEPH_MONC_PROTOCOL) {
-    dout(0) << "monc protocol v " << (int)m->get_header().monc_protocol << " != my " << CEPH_MONC_PROTOCOL
-           << " from " << m->get_orig_source_inst() << " " << *m << dendl;
-    delete m;
-    return true;
-  }
-
   // lock!
   osd_lock.Lock();
   _dispatch(m);