PG::choose_acting: in mixed cluster case, acting may include backfill

Fixes: 9696
Backport: firefly, giant
Introduced: 92cfd370395385ca5537b5bc72220934c9f09026
Signed-off-by: Samuel Just <sam.just@inktank.com>
(cherry picked from commit 9b18d99817c8b54e30dff45047dfe1b29871d659)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 11a34a283082afdc32b199dca9602c47eeb8b804..9356df49414be6f3bd0c3ef0d935ff30483dae40 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1281,7 +1281,6 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id)
     if (*i != CRUSH_ITEM_NONE)
       ++num_want_acting;
   }
-  assert(want_acting_backfill.size() - want_backfill.size() == num_want_acting);
 
   // This is a bit of a problem, if we allow the pg to go active with
   // want.size() < min_size, we won't consider the pg to have been