From: Samuel Just <sam.just@inktank.com>
Date: Fri, 1 Jun 2012 16:50:10 +0000 (-0700)
Subject: OSD: check for deleting in process_peering_event
X-Git-Tag: v0.50~109^2~2^2~61
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64b71c697e2cc74283753800209bafebfef3901f;p=ceph.git

OSD: check for deleting in process_peering_event

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cdc8d32ef643..e21d7c71d528 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5339,7 +5339,7 @@ void OSD::process_peering_event(PG *pg)
     pg->lock();
     curmap = osdmap;
     map_lock.put_read();
-    if (pg->peering_queue.empty()) {
+    if (pg->deleting) {
       pg->unlock();
       return;
     }