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

Fixes: #7482
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 2934b0e87e271b376491ae30ecf5ff6995aabcd7..bcde66257b55f2f4696bb7b941c50f789367b5c0 100644 (file)
--- 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;
     }
   }