PG::choose_acting: filter CRUSH_ITEM_NONE out of have

Fixes: #7672
Signed-off-by: Samuel Just <sam.just@inktank.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fe759efe1422fb28105c5869ce1fb5831d0b387b..94728f41abaa008a8bf0237be4adce020cb4feb8 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1270,11 +1270,13 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id)
   boost::scoped_ptr<PGBackend::IsRecoverablePredicate> recoverable_predicate(
     get_pgbackend()->get_is_recoverable_predicate());
   set<pg_shard_t> have;
-  for (int i = 0; i < (int)want.size(); ++i)
-    have.insert(
-      pg_shard_t(
-       want[i],
-       pool.info.ec_pool() ? i : ghobject_t::NO_SHARD));
+  for (int i = 0; i < (int)want.size(); ++i) {
+    if (want[i] != CRUSH_ITEM_NONE)
+      have.insert(
+       pg_shard_t(
+         want[i],
+         pool.info.ec_pool() ? i : ghobject_t::NO_SHARD));
+  }
   if (!(*recoverable_predicate)(have)) {
     want_acting.clear();
     return false;