[Pkg-ceph-commits] [ceph] 02/02: Upload 0.87 with proper upstream tarball.

[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 c724072 (experimental)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Thu Oct 30 01:44:24 2014

    Upload 0.87 with proper upstream tarball.
---
 debian/changelog              |  3 +-
 debian/patches/bug-9513.patch | 66 -------------------------------------------
 debian/patches/series         |  1 -
 3 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e7d2a6..990e2ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ ceph (0.87-1) experimental; urgency=medium
   * New major upstream release [October 2014].
     + new "libradosstriper*" binary packages.
   * Patchworks (removed old patches, refreshed remaining ones).
-    + "bug-9513.patch" to fix read performance regression in ObjectCacher.
     + "bug-9814.patch" to prevent OSD crash. Thanks, Haomai Wang.
   * Install systemd sleep handler.
   * Exclude erasure-code plugins from `dh_makeshlibs` processing to avoid
@@ -17,7 +16,7 @@ ceph (0.87-1) experimental; urgency=medium
   * Build with "--with-babeltrace".
   * Build and statically link bundled RocksDB.
 
- -- Dmitry Smirnov <onlyjob at debian.org>  Wed, 29 Oct 2014 13:06:21 +1100
+ -- Dmitry Smirnov <onlyjob at debian.org>  Thu, 30 Oct 2014 12:43:49 +1100
 
 ceph (0.80.7-1) unstable; urgency=medium
 
diff --git a/debian/patches/bug-9513.patch b/debian/patches/bug-9513.patch
deleted file mode 100644
index 6a7b2e0..0000000
--- a/debian/patches/bug-9513.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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 fc500e2..6098e34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 ## 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