mon: allow ping through despite synch/quorum status, with session

Attach sessions to ping messages, too.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 509a881f7e0d709dd84a464c94f1eaf757c07391..f2d7723e3615674aba4368d006a018a688a880e5 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3414,11 +3414,8 @@ void Monitor::_ms_dispatch(Message *m)
     // 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 &&
-                       m->get_type() != CEPH_MSG_MON_GET_MAP)) {
-      if (m->get_type() == CEPH_MSG_PING) {
-        // let it go through and be dispatched immediately!
-        return dispatch_op(op);
-      }
+                       m->get_type() != CEPH_MSG_MON_GET_MAP &&
+                       m->get_type() != CEPH_MSG_PING)) {
       dout(1) << __func__ << " dropping stray message " << *m
              << " from " << m->get_source_inst() << dendl;
       return;
@@ -3459,7 +3456,8 @@ void Monitor::_ms_dispatch(Message *m)
 
   if ((is_synchronizing() ||
        (s->global_id == 0 && !exited_quorum.is_zero())) &&
-      !src_is_mon) {
+      !src_is_mon &&
+      m->get_type() != CEPH_MSG_PING) {
     waitlist_or_zap_client(op);
   } else {
     dispatch_op(op);