From: David Zafman <david.zafman@inktank.com>
Date: Tue, 17 Dec 2013 20:39:31 +0000 (-0800)
Subject: osd: Recovery reservations need to include backfill peers
X-Git-Tag: v0.77~23^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a07d68205b9b79d93cb329f00f583d5820f08709;p=ceph.git

osd: Recovery reservations need to include backfill peers

Caused by 86e4fd4f7a9848511e1bf9ae433fcd3a35a0818f

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index b5d3f8829651..663920372701 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5931,8 +5931,8 @@ void PG::RecoveryState::Clean::exit()
 PG::RecoveryState::Active::Active(my_context ctx)
   : my_base(ctx),
     NamedState(context< RecoveryMachine >().pg->cct, "Started/Primary/Active"),
-    sorted_acting_set(context< RecoveryMachine >().pg->acting.begin(),
-                      context< RecoveryMachine >().pg->acting.end()),
+    sorted_acting_set(context< RecoveryMachine >().pg->actingbackfill.begin(),
+                      context< RecoveryMachine >().pg->actingbackfill.end()),
     all_replicas_activated(false)
 {
   context< RecoveryMachine >().log_enter(state_name);