diff options
| author | Sage Weil <sage@inktank.com> | 2013-02-12 14:18:24 -0800 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-02-12 14:18:37 -0800 |
| commit | 1b05517a83cb23ee3c2a0ea5835b19bc25e5bc01 (patch) | |
| tree | b5e3b57466f25363b0039bee474bb8ab914dafab | |
| parent | de5247ed56287f3dac31a2f5a186be26f94a9d27 (diff) | |
| download | ceph-1b05517a83cb23ee3c2a0ea5835b19bc25e5bc01.tar.gz | |
msg/Messenger: rename option
It's unhandled, not unexpected.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/common/config_opts.h | 2 | ||||
| -rw-r--r-- | src/msg/Messenger.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 733e71038c0..ea9b6680bfb 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 2f0710c9ebf..2615623c41c 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(); } /** |