]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon/Monitor: allow probe if MMonProbe::mon_release == 0
authorSage Weil <sage@redhat.com>
Sat, 27 Apr 2019 16:03:30 +0000 (11:03 -0500)
committerSage Weil <sage@redhat.com>
Sat, 27 Apr 2019 16:03:30 +0000 (11:03 -0500)
Mimic doesn't set this, but we still need to allow them to probe us.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/Monitor.cc

index 54b170c7e661f1949bcc48dd6f0e5e32c5819470..9f2bd5c00c80e2e5d4297d6a26af8bdee34ad018 100644 (file)
@@ -1851,7 +1851,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