]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: allow recovery in peered
authorSamuel Just <sjust@redhat.com>
Wed, 26 Nov 2014 22:00:34 +0000 (14:00 -0800)
committerSamuel Just <sjust@redhat.com>
Fri, 30 Jan 2015 19:45:37 +0000 (11:45 -0800)
Signed-off-by: Samuel Just <sjust@redhat.com>
src/osd/OSD.cc

index f9079a10e3257abb3db1c47f8a0a2ffd0cb6f5fe..27296bcefdec6ea319b5deac32af5d8cbdb7a1f5 100644 (file)
@@ -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;
     }