msgr: print message encoding version to aid debugging

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index feb3d81b662a6083b2dc4ed7ca0d7a021201d486..bbc884bbd587734cf1e9072672b735ec488331de 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -512,7 +512,9 @@ Message *decode_message(ceph_msg_header& header, ceph_msg_footer& footer,
     m->decode_payload();
   }
   catch (buffer::error *e) {
-    dout(0) << "failed to decode message of type " << type << ": " << *e << dendl;
+    dout(0) << "failed to decode message of type " << type
+           << " v" << header.version
+           << ": " << *e << dendl;
     delete e;
     if (g_conf.ms_die_on_bad_msg)
       assert(0);

diff --git a/src/msg/Message.h b/src/msg/Message.h
index 60d1ac7c97baddb01e3d66c03a7abe3d73ab8c71..57c9e151c8094e51b88811709245e27058066110 100644 (file)
--- a/src/msg/Message.h
+++ b/src/msg/Message.h
@@ -370,6 +370,8 @@ extern Message *decode_message(ceph_msg_header &header, ceph_msg_footer& footer,
                               bufferlist& front, bufferlist& middle, bufferlist& data);
 inline ostream& operator<<(ostream& out, Message& m) {
   m.print(out);
+  if (m.get_header().version)
+    out << " v" << m.get_header().version;
   return out;
 }