diff options
author | Sage Weil <sage@inktank.com> | 2013-10-07 04:37:20 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-10-07 04:37:20 -0700 |
commit | f7c5d1ac94ca3002b09fa178c44a8701ffe71281 (patch) | |
tree | d7c0aae647db160e7eac50b4956d3fdc95210c5c | |
parent | 901427c522818c838a929ddf16663a0dc44b4b07 (diff) | |
parent | 02da1a1d79d97570f682ab84b289cdff0bc800d4 (diff) | |
download | ceph-f7c5d1ac94ca3002b09fa178c44a8701ffe71281.tar.gz |
Merge remote-tracking branch 'gh/next'
-rw-r--r-- | src/mon/Monitor.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 3fe658d9623..d8c90bc3d76 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -2583,10 +2583,10 @@ bool Monitor::_ms_dispatch(Message *m) // and considering that we are creating a new session it is safe to // assume that the sender hasn't authenticated yet, so we have no way // of assessing whether we should handle it or not. - if (!src_is_mon && m->get_type() != CEPH_MSG_AUTH) { + if (!src_is_mon && (m->get_type() != CEPH_MSG_AUTH && + m->get_type() != CEPH_MSG_MON_GET_MAP)) { dout(1) << __func__ << " dropping stray message " << *m << " from " << m->get_source_inst() << dendl; - m->put(); return false; } |