[Pkg-ceph-commits] [ceph] 01/06: bug-9513.patch

[Dmitry Smirnov]

This is an automated email from the git hooks/post-receive script.

onlyjob pushed a commit to branch experimental
in repository ceph.

commit a082483
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Oct 28 23:57:14 2014

    bug-9513.patch
---
 debian/patches/bug-9513.patch | 66 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series         |  1 +
 2 files changed, 67 insertions(+)

diff --git a/debian/patches/bug-9513.patch b/debian/patches/bug-9513.patch
new file mode 100644
index 0000000..6a7b2e0
--- /dev/null
+++ b/debian/patches/bug-9513.patch
@@ -0,0 +1,66 @@
+From 65be257e9295619b960b49f6aa80ecdf8ea4d16a Mon Sep 17 00:00:00 2001
+From: Adam Crume <adamcrume at gmail.com>
+Date: Tue, 7 Oct 2014 17:45:53 -0700
+Subject: [PATCH] Fix read performance regression in ObjectCacher
+
+The regression was introduced in commit
+4fc9fffc494abedac0a9b1ce44706343f18466f1.  The problem is that the cache
+thinks it's full (when it's not), so it defers the read.  This change
+frees up cache space if necessary and only defers the read if enough
+space cannot be freed.
+
+Fixes: 9513
+Signed-off-by: Adam Crume <adamcrume at gmail.com>
+(cherry picked from commit 82175ec94acc89dc75da0154f86187fb2e4dbf5e)
+---
+ src/osdc/ObjectCacher.cc | 8 ++++++--
+ src/osdc/ObjectCacher.h  | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+--- a/src/osdc/ObjectCacher.cc
++++ b/src/osdc/ObjectCacher.cc
+@@ -949,16 +949,16 @@
+   }    
+ }
+ 
+ 
+-void ObjectCacher::trim()
++void ObjectCacher::trim(uint64_t extra_space)
+ {
+   assert(lock.is_locked());
+   ldout(cct, 10) << "trim  start: bytes: max " << max_size << "  clean " << get_stat_clean()
+ 		 << ", objects: max " << max_objects << " current " << ob_lru.lru_get_size()
+ 		 << dendl;
+ 
+-  while (get_stat_clean() > 0 && (uint64_t) get_stat_clean() > max_size) {
++  while (get_stat_clean() > 0 && (uint64_t) (get_stat_clean() + get_stat_rx() + extra_space) > max_size) {
+     BufferHead *bh = static_cast<BufferHead*>(bh_lru_rest.lru_expire());
+     if (!bh)
+       break;
+ 
+@@ -1114,8 +1114,12 @@
+            bh_it != missing.end();
+            ++bh_it) {
+         loff_t clean = get_stat_clean() + get_stat_rx() +
+                        bh_it->second->length();
++	if (get_stat_rx() > 0 && static_cast<uint64_t>(clean) > max_size) {
++	  trim(bh_it->second->length());
++	}
++	clean = get_stat_clean() + get_stat_rx() + bh_it->second->length();
+         if (get_stat_rx() > 0 && static_cast<uint64_t>(clean) > max_size) {
+           // cache is full -- wait for rx's to complete
+           ldout(cct, 10) << "readx missed, waiting on cache to free "
+                          << (clean - max_size) << " bytes" << dendl;
+--- a/src/osdc/ObjectCacher.h
++++ b/src/osdc/ObjectCacher.h
+@@ -434,9 +434,9 @@
+   // io
+   void bh_read(BufferHead *bh);
+   void bh_write(BufferHead *bh);
+ 
+-  void trim();
++  void trim(uint64_t extra_space = 0);
+   void flush(loff_t amount=0);
+ 
+   /**
+    * flush a range of buffers
diff --git a/debian/patches/series b/debian/patches/series
index 6098e34..fc500e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 ## Backported / Upstream
 bug-9341.patch
+bug-9513.patch
 bug-9814.patch
 sleep-recover.patch
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git