From: Sage Weil <sage@redhat.com>
Date: Wed, 25 Oct 2017 22:04:24 +0000 (-0500)
Subject: mon: ignore PRIMARY_AFFINITY for purposes of complaning about missing features
X-Git-Tag: v13.0.1~348^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17bf9c896d4707396bfc0d4984675caa05794d1f;p=ceph.git

mon: ignore PRIMARY_AFFINITY for purposes of complaning about missing features

This was a weird proxy for old mons.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index c14c8847136..1b848f251c9 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -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;
   }