summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <sam.just@inktank.com>2013-08-06 15:04:33 -0700
committerSamuel Just <sam.just@inktank.com>2013-08-06 15:04:33 -0700
commit68203903570f4d654d453468078476be433fc65a (patch)
tree58b755d31634a6b81171269c405240ec9ca64c23
parent944f3b73531af791c90f0f061280160003545c63 (diff)
downloadceph-68203903570f4d654d453468078476be433fc65a.tar.gz
OSD: suspend timeout on process_peering_events pg lock
Signed-off-by: Samuel Just <sam.just@inktank.com>
-rw-r--r--src/osd/OSD.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 7a2417cf248..1a77dae730a 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();