From: Sage Weil <sage@inktank.com>
Date: Wed, 20 Feb 2013 00:09:25 +0000 (-0800)
Subject: osd/OSDMap: note OSDHASHPSPOOL feature when pool FLAG_HASHPSPOOL is set
X-Git-Tag: v0.59~167^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=128cb17d87ff9ac42434bd508ccc96bc42d53484;p=ceph.git

osd/OSDMap: note OSDHASHPSPOOL feature when pool FLAG_HASHPSPOOL is set

This allows the osd and mon to enforce feature bits on their connections.

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

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index a2db1a117d92..8f0b01db7060 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -726,6 +726,13 @@ uint64_t OSDMap::get_features(uint64_t *pmask) const
     features |= CEPH_FEATURE_CRUSH_TUNABLES2;
   mask |= CEPH_FEATURES_CRUSH;
 
+  for (map<int64_t,pg_pool_t>::const_iterator p = pools.begin(); p != pools.end(); ++p) {
+    if (p->second.flags & pg_pool_t::FLAG_HASHPSPOOL) {
+      features |= CEPH_FEATURE_OSDHASHPSPOOL;
+    }
+  }
+  mask |= CEPH_FEATURE_OSDHASHPSPOOL;
+
   if (pmask)
     *pmask = mask;
   return features;