]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Recovery reservations need to include backfill peers
authorDavid Zafman <david.zafman@inktank.com>
Tue, 17 Dec 2013 20:39:31 +0000 (12:39 -0800)
committerDavid Zafman <david.zafman@inktank.com>
Thu, 9 Jan 2014 00:33:57 +0000 (16:33 -0800)
Caused by 86e4fd4f7a9848511e1bf9ae433fcd3a35a0818f

Signed-off-by: David Zafman <david.zafman@inktank.com>
src/osd/PG.cc

index b5d3f8829651a24780ed2f5a611676a3e2bb967e..66392037270112a18202695e4ba2e10985a3a334 100644 (file)
@@ -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);