From: Sage Weil <sage@inktank.com>
Date: Tue, 12 Feb 2013 22:18:24 +0000 (-0800)
Subject: msg/Messenger: rename option
X-Git-Tag: v0.58~90
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1b05517a83cb23ee3c2a0ea5835b19bc25e5bc01;p=ceph.git

msg/Messenger: rename option

It's unhandled, not unexpected.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 733e71038c01..ea9b6680bfbc 100644
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -100,7 +100,7 @@ OPTION(ms_initial_backoff, OPT_DOUBLE, .2)
 OPTION(ms_max_backoff, OPT_DOUBLE, 15.0)
 OPTION(ms_nocrc, OPT_BOOL, false)
 OPTION(ms_die_on_bad_msg, OPT_BOOL, false)
-OPTION(ms_die_on_unexpected_msg, OPT_BOOL, false)
+OPTION(ms_die_on_unhandled_msg, OPT_BOOL, false)
 OPTION(ms_dispatch_throttle_bytes, OPT_U64, 100 << 20)
 OPTION(ms_bind_ipv6, OPT_BOOL, false)
 OPTION(ms_bind_port_min, OPT_INT, 6800)
diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h
index 2f0710c9ebfe..2615623c41cb 100644
--- a/src/msg/Messenger.h
+++ b/src/msg/Messenger.h
@@ -554,7 +554,7 @@ public:
 	return;
     lsubdout(cct, ms, 0) << "ms_deliver_dispatch: unhandled message " << m << " " << *m << " from "
 			 << m->get_source_inst() << dendl;
-    assert(!cct->_conf->ms_die_on_unexpected_msg);
+    assert(!cct->_conf->ms_die_on_unhandled_msg);
     m->put();
   }
   /**