From: Samuel Just <sam.just@inktank.com>
Date: Tue, 6 Aug 2013 22:04:33 +0000 (-0700)
Subject: OSD: suspend timeout on process_peering_events pg lock
X-Git-Tag: v0.67~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=68203903570f4d654d453468078476be433fc65a;p=ceph.git

OSD: suspend timeout on process_peering_events pg lock

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7a2417cf248a..1a77dae730ab 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -7133,7 +7133,7 @@ void OSD::process_peering_events(
        ++i) {
     set<boost::intrusive_ptr<PG> > split_pgs;
     PG *pg = *i;
-    pg->lock();
+    pg->lock_suspend_timeout(handle);
     curmap = service.get_osdmap();
     if (pg->deleting) {
       pg->unlock();