Merge pull request #3350 from liewegas/wip-10477

osd: populate blocked_by with peers we are trying to activate

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/osd/PG.cc
index 1ec0112b9d4db3d18f9d8063343942d10a6b5cdc,185af98f3325e3ae34e139bc6cad90478b9fd5d9..4c05a8400fae7fcdbc072891caa5e4cd6e0d6831
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -6508,9 -6493,9 +6521,10 @@@ void PG::RecoveryState::Active::exit(
    PG *pg = context< RecoveryMachine >().pg;
    pg->osd->local_reserver.cancel_reservation(pg->info.pgid);
  
+   pg->blocked_by.clear();
    pg->backfill_reserved = false;
    pg->backfill_reserving = false;
 +  pg->state_clear(PG_STATE_ACTIVATING);
    pg->state_clear(PG_STATE_DEGRADED);
    pg->state_clear(PG_STATE_UNDERSIZED);
    pg->state_clear(PG_STATE_BACKFILL_TOOFULL);