msg: hexdump messages we can't decode at configurable debug level

We had this hard-coded to 30.  Make it tunable.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 3a09b545cc68bf7ad10edddf567877428636080f..310d432e1754be4e5ec71d600e8bba9c2d566195 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -136,6 +136,7 @@ OPTION(ms_inject_delay_max, OPT_DOUBLE, 1)         // seconds
 OPTION(ms_inject_delay_probability, OPT_DOUBLE, 0) // range [0, 1]
 OPTION(ms_inject_internal_delays, OPT_DOUBLE, 0)   // seconds
 OPTION(ms_dump_on_send, OPT_BOOL, false)           // hexdump msg to log on send
+OPTION(ms_dump_corrupt_message_level, OPT_INT, 30)  // debug level to hexdump undecodeable messages at
 
 OPTION(inject_early_sigterm, OPT_BOOL, false)
 

diff --git a/src/msg/Message.cc b/src/msg/Message.cc
index d16dbddf3052497f5b396f7aab999490f2c67afb..42d4e94f15c05c45cb556f700166578b6c806bb0 100644 (file)
--- a/src/msg/Message.cc
+++ b/src/msg/Message.cc
@@ -720,7 +720,7 @@ Message *decode_message(CephContext *cct, ceph_msg_header& header, ceph_msg_foot
       lderr(cct) << "failed to decode message of type " << type
                 << " v" << header.version
                 << ": " << e.what() << dendl;
-      ldout(cct, 30) << "dump: \n";
+      ldout(cct, cct->_conf->ms_dump_corrupt_message_level) << "dump: \n";
       m->get_payload().hexdump(*_dout);
       *_dout << dendl;
       if (cct->_conf->ms_die_on_bad_msg)