[Pkg-ceph-commits] [ceph] 06/06: Limit the amount of data per chunk in omap push operations to 64k, ensuring that OSD threads don't hit timeouts during recovery operations (LP: #1628750):

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.

commit e9ea8b03201658417bbf31e286c6f4f98381c482
Author: James Page <james.page at ubuntu.com>
Date:   Thu Sep 29 08:58:11 2016 +0100

    Limit the amount of data per chunk in omap push operations to 64k, ensuring that OSD threads don't hit timeouts during recovery operations (LP: #1628750):
    
    * Limit the amount of data per chunk in omap push operations to 64k,
      ensuring that OSD threads don't hit timeouts during recovery
      operations (LP: #1628750):
      - d/p/osd-limit-omap-data-in-push-op.patch: Cherry pick fix from
        upstream master branch.
---
 debian/changelog      | 5 +++++
 debian/patches/series | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0d8f08a..162a680 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ ceph (10.2.3-0ubuntu1) UNRELEASED; urgency=medium
   * New upstream point release (LP: #1628809):
     - d/p/rocksdb-flags.patch: Dropped, included upstream.
     - d/p/*: Refreshed.
+  * Limit the amount of data per chunk in omap push operations to 64k,
+    ensuring that OSD threads don't hit timeouts during recovery
+    operations (LP: #1628750):
+    - d/p/osd-limit-omap-data-in-push-op.patch: Cherry pick fix from
+      upstream master branch.
 
  -- James Page <james.page at ubuntu.com>  Thu, 29 Sep 2016 08:43:09 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 1f934af..b04f5ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,6 @@ tests-disable.patch
 ## From Ubuntu
 fix-argparse-defaults.patch
 fix-cycles-arch.patch
-rocksdb-flags.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
+osd-limit-omap-data-in-push-op.patch

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