From: Samuel Just <sam.just@inktank.com>
Date: Thu, 22 Jan 2015 19:11:35 +0000 (-0800)
Subject: Merge pull request #3350 from liewegas/wip-10477
X-Git-Tag: v0.93~213
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=387a37980f2801900e50465a0cff6d3ed31905b4;p=ceph.git

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>
---

387a37980f2801900e50465a0cff6d3ed31905b4
diff --cc src/osd/PG.cc
index 1ec0112b9d4db,185af98f3325e..4c05a8400fae7
--- a/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);