From 6f5f4e7e102f748a1b0b93db7ee98474974feebe Mon Sep 17 00:00:00 2001 From: sageweil Date: Tue, 28 Aug 2007 23:53:05 +0000 Subject: [PATCH] minor tuning git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1720 29311d96-e01e-0410-9327-a35deaab8ce9 --- trunk/ceph/ebofs/BufferCache.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/trunk/ceph/ebofs/BufferCache.cc b/trunk/ceph/ebofs/BufferCache.cc index b02f4e0058ac2..837c67f132e43 100644 --- a/trunk/ceph/ebofs/BufferCache.cc +++ b/trunk/ceph/ebofs/BufferCache.cc @@ -720,7 +720,7 @@ void ObjectCache::clone_to(Onode *other) BufferHead *ObjectCache::merge_bh_left(BufferHead *left, BufferHead *right) { - dout(-10) << "merge_bh_left " << *left << " " << *right << dendl; + dout(10) << "merge_bh_left " << *left << " " << *right << dendl; assert(left->end() == right->start()); assert(left->is_clean()); assert(right->is_clean()); @@ -737,7 +737,7 @@ BufferHead *ObjectCache::merge_bh_left(BufferHead *left, BufferHead *right) remove_bh(right); bc->lru_rest.lru_remove(right); delete right; - dout(-10) << "merge_bh_left result " << *left << dendl; + dout(10) << "merge_bh_left result " << *left << dendl; return left; } @@ -766,7 +766,9 @@ void ObjectCache::try_merge_bh_left(map::iterator& p) if (p->second->end() == bh->start() && p->second->is_clean() && bh->is_clean() && - bh->get_num_ref() == 0) + bh->get_num_ref() == 0 && + bh->data.buffers().size() < 8 && + p->second->data.buffers().size() < 8) bh = merge_bh_left(p->second, bh); // yay! else p++; // nope. @@ -785,7 +787,9 @@ void ObjectCache::try_merge_bh_right(map::iterator& p) bh->end() == p->second->start() && p->second->is_clean() && bh->is_clean() && - p->second->get_num_ref() == 0) { + p->second->get_num_ref() == 0 && + bh->data.buffers().size() < 8 && + p->second->data.buffers().size() < 8) { BufferHead *right = p->second; p--; merge_bh_left(bh, right); -- 2.39.5