From fcb7e86101c6d85d7d6bfebde2edeb6cc4e7d9f6 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 23 Aug 2013 22:20:55 -0700 Subject: limit how long flusher holds the lock --- src/osdc/ObjectCacher.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 51fad699555..2d721e75887 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -1429,8 +1429,10 @@ void ObjectCacher::flusher_entry() utime_t cutoff = ceph_clock_now(cct); cutoff -= max_dirty_age; BufferHead *bh = 0; + int max = 20; while ((bh = static_cast(bh_lru_dirty.lru_get_next_expire())) != 0 && - bh->last_write < cutoff) { + bh->last_write < cutoff && + --max > 0) { ldout(cct, 10) << "flusher flushing aged dirty bh " << *bh << dendl; bh_write(bh); } -- cgit v1.2.1