mon/Monitor: allow probe if MMonProbe::mon_release == 0

Mimic doesn't set this, but we still need to allow them to probe us.

(and so does luminous)

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 90e4c5fad569a39504ad3444a41122360cab77bd)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 04ca4fcbc6131b4ad8b187ad16490e582b739138..b51b9df2fa9413f8432ce40a8aa16b356dc94a22 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1850,7 +1850,8 @@ void Monitor::handle_probe_probe(MonOpRequestRef op)
   dout(10) << "handle_probe_probe " << m->get_source_inst() << *m
           << " features " << m->get_connection()->get_features() << dendl;
   uint64_t missing = required_features & ~m->get_connection()->get_features();
-  if (m->mon_release < monmap->min_mon_release || missing) {
+  if ((m->mon_release > 0 && m->mon_release < monmap->min_mon_release) ||
+      missing) {
     dout(1) << " peer " << m->get_source_addr()
            << " release " << (int)m->mon_release
            << " < min_mon_release " << (int)monmap->min_mon_release