]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: ignore PRIMARY_AFFINITY for purposes of complaning about missing features
authorSage Weil <sage@redhat.com>
Wed, 25 Oct 2017 22:04:24 +0000 (17:04 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Oct 2017 13:31:07 +0000 (08:31 -0500)
This was a weird proxy for old mons.

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

index c14c884713669dc3bb6f5d64152f4411476b02b9..1b848f251c91204cc192c9505217cb83b7db03d1 100644 (file)
@@ -1627,12 +1627,10 @@ void Monitor::handle_probe_probe(MonOpRequestRef op)
   if (missing) {
     dout(1) << " peer " << m->get_source_addr() << " missing features "
            << missing << dendl;
-    if (m->get_connection()->has_feature(CEPH_FEATURE_OSD_PRIMARY_AFFINITY)) {
-      MMonProbe *r = new MMonProbe(monmap->fsid, MMonProbe::OP_MISSING_FEATURES,
-                                  name, has_ever_joined);
-      m->required_features = required_features;
-      m->get_connection()->send_message(r);
-    }
+    MMonProbe *r = new MMonProbe(monmap->fsid, MMonProbe::OP_MISSING_FEATURES,
+                                name, has_ever_joined);
+    m->required_features = required_features;
+    m->get_connection()->send_message(r);
     goto out;
   }