From: Samuel Just <sjust@redhat.com>
Date: Wed, 26 Nov 2014 22:00:34 +0000 (-0800)
Subject: OSD: allow recovery in peered
X-Git-Tag: v0.93~127^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b31221afa005b0172c3c48397d94dde374f7ac1d;p=ceph.git

OSD: allow recovery in peered

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index f9079a10e32..27296bcefde 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7835,7 +7835,7 @@ void OSD::do_recovery(PG *pg, ThreadPool::TPHandle &handle)
     return;
   } else {
     pg->lock_suspend_timeout(handle);
-    if (pg->deleting || !(pg->is_active() && pg->is_primary())) {
+    if (pg->deleting || !(pg->is_peered() && pg->is_primary())) {
       pg->unlock();
       goto out;
     }