Merge pull request ceph#868 from ceph/wip-6896

osd: Remove bogus assert(active == acting.size())

Reviewed-by: Samuel Just <[email protected]>

src/osd/PG.cc

@@ -1204,9 +1204,6 @@ void PG::activate(ObjectStore::Transaction& t,
   if (is_primary()) {
     // start up replicas
 
-    // count replicas that are not backfilling
-    unsigned active = 1;
-
     assert(actingbackfill.size() > 0);
     for (unsigned i=1; i<actingbackfill.size(); i++) {
       int peer = actingbackfill[i];
@@ -1269,9 +1266,6 @@ void PG::activate(ObjectStore::Transaction& t,
       if (needs_past_intervals)
 	m->past_intervals = past_intervals;
 
-      if (pi.last_backfill == hobject_t::get_max())
-	active++;
-
       // update local version of peer's missing list!
       if (m && pi.last_backfill != hobject_t()) {
         for (list<pg_log_entry_t>::iterator p = m->log.log.begin();
@@ -1299,8 +1293,6 @@ void PG::activate(ObjectStore::Transaction& t,
       }
     }
 
-    assert(active == acting.size());
-
     // degraded?
     if (get_osdmap()->get_pg_size(info.pgid) > acting.size())
       state_set(PG_STATE_DEGRADED);