OSDMap::_apply_primary_affinity: skip CRUSH_ITEM_NONE in non-default …

…check Fixes: ceph#7482 Signed-off-by: Samuel Just <[email protected]> Reviewed-by: David Zafman <[email protected]>
joliny · Feb 20, 2014 · aa110af · aa110af
1 parent b3bb9ef
commit aa110af
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -1426,7 +1426,8 @@ void OSDMap::_apply_primary_affinity(ps_t seed,
 
   bool any = false;
   for (vector<int>::const_iterator p = osds->begin(); p != osds->end(); ++p) {
-    if ((*osd_primary_affinity)[*p] != CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
+    if (*p != CRUSH_ITEM_NONE &&
+	(*osd_primary_affinity)[*p] != CEPH_OSD_DEFAULT_PRIMARY_AFFINITY) {
       any = true;
     }
   }