From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Aug 2014 21:28:57 +0000 (-0700)
Subject: osd: fix feature requirement for mons
X-Git-Tag: v0.80.6~68
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9005f33d0d80d6d2b93493b38866b7f74f87d1eb;p=ceph.git

osd: fix feature requirement for mons

These features should be set on the client_messenger, not
cluster_messenger.

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 51fdfa94d900..7e42880c440e 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5713,11 +5713,12 @@ void OSD::check_osdmap_features(ObjectStore *fs)
     }
   }
   {
-    Messenger::Policy p = cluster_messenger->get_policy(entity_name_t::TYPE_MON);
+    Messenger::Policy p = client_messenger->get_policy(entity_name_t::TYPE_MON);
     uint64_t mask;
     uint64_t features = osdmap->get_features(entity_name_t::TYPE_MON, &mask);
     if ((p.features_required & mask) != features) {
       dout(0) << "crush map has features " << features
+	      << " was " << p.features_required
 	      << ", adjusting msgr requires for mons" << dendl;
       p.features_required = (p.features_required & ~mask) | features;
       client_messenger->set_policy(entity_name_t::TYPE_MON, p);