From: Sage Weil <sage@redhat.com>
Date: Tue, 21 Jul 2015 15:54:08 +0000 (-0400)
Subject: osd: ignore CRUSH_ITEM_NONE when calculating interval features
X-Git-Tag: v9.1.0~346^2~44
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8063a9d310f490e8a7a5cd235753105ca1ecf377;p=ceph.git

osd: ignore CRUSH_ITEM_NONE when calculating interval features

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index ef3a969caaec..126d768ff9f4 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -4723,11 +4723,15 @@ void PG::start_peering_interval(
   acting_features = CEPH_FEATURES_SUPPORTED_DEFAULT;
   upacting_features = CEPH_FEATURES_SUPPORTED_DEFAULT;
   for (vector<int>::iterator p = acting.begin(); p != acting.end(); ++p) {
+    if (*p == CRUSH_ITEM_NONE)
+      continue;
     uint64_t f = osdmap->get_xinfo(*p).features;
     acting_features &= f;
     upacting_features &= f;
   }
   for (vector<int>::iterator p = up.begin(); p != up.end(); ++p) {
+    if (*p == CRUSH_ITEM_NONE)
+      continue;
     upacting_features &= osdmap->get_xinfo(*p).features;
   }