From: Samuel Just <sam.just@inktank.com>
Date: Fri, 19 Apr 2013 17:50:43 +0000 (-0700)
Subject: PG: bail if deleting in _finish_recovery
X-Git-Tag: v0.61~136^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b8cb9d7e7b3a0edd55b60c19a0c935129bd091a5;p=ceph.git

PG: bail if deleting in _finish_recovery

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index a2fdecc89ae7..0cc504e265b8 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1980,6 +1980,10 @@ void PG::finish_recovery(list<Context*>& tfin)
 void PG::_finish_recovery(Context *c)
 {
   lock();
+  if (deleting) {
+    unlock();
+    return;
+  }
   if (c == finish_sync_event) {
     dout(10) << "_finish_recovery" << dendl;
     finish_sync_event = 0;