From 17bf9c896d4707396bfc0d4984675caa05794d1f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 25 Oct 2017 17:04:24 -0500 Subject: [PATCH] mon: ignore PRIMARY_AFFINITY for purposes of complaning about missing features This was a weird proxy for old mons. Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index c14c88471366..1b848f251c91 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; } -- 2.47.3