[Pkg-ceph-commits] [ceph] 05/06: Patch work

James Downing Page jamespage at moszumanska.debian.org
Thu Sep 29 07:58:54 UTC 2016


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

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

commit 6865a242b221da280504b2cc11adda5597496302
Author: James Page <james.page at ubuntu.com>
Date:   Thu Sep 29 08:50:56 2016 +0100

    Patch work
    
      - d/p/rocksdb-flags.patch: Dropped, included upstream.
      - d/p/*: Refreshed.
---
 debian/changelog                                   |  4 ++-
 debian/patches/fix-argparse-defaults.patch         |  2 +-
 .../patches/osd-limit-omap-data-in-push-op.patch   | 40 ++++++++++++++++++++++
 debian/patches/rocksdb-flags.patch                 | 16 ---------
 debian/patches/sleep-recover.patch                 |  2 +-
 debian/patches/tests-disable.patch                 | 11 +++---
 6 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7138366..0d8f08a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ceph (10.2.3-0ubuntu1) UNRELEASED; urgency=medium
 
-  * New upstream point release (LP: #1628809).
+  * New upstream point release (LP: #1628809):
+    - d/p/rocksdb-flags.patch: Dropped, included upstream.
+    - d/p/*: Refreshed.
 
  -- James Page <james.page at ubuntu.com>  Thu, 29 Sep 2016 08:43:09 +0100
 
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 19a6a29..505f5fe 100644
--- a/debian/patches/fix-argparse-defaults.patch
+++ b/debian/patches/fix-argparse-defaults.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- a/src/ceph-disk/ceph_disk/main.py
 +++ b/src/ceph-disk/ceph_disk/main.py
-@@ -4432,6 +4432,7 @@ def parse_args(argv):
+@@ -4479,6 +4479,7 @@ def parse_args(argv):
      parser.set_defaults(
          # we want to hold on to this, for later
          prog=parser.prog,
diff --git a/debian/patches/osd-limit-omap-data-in-push-op.patch b/debian/patches/osd-limit-omap-data-in-push-op.patch
new file mode 100644
index 0000000..1754ffe
--- /dev/null
+++ b/debian/patches/osd-limit-omap-data-in-push-op.patch
@@ -0,0 +1,40 @@
+From 56064c5cb645254574dbad00e6c16b783115bb93 Mon Sep 17 00:00:00 2001
+From: Wanlong Gao <wanlong.gao at easystack.cn>
+Date: Thu, 23 Jun 2016 20:04:25 +0800
+Subject: [PATCH] osd: limit omap data in push op
+
+We already have the config osd_recovery_max_chunk to limit the total
+size of omap entries and omap data. But we need an individual config
+to limit the number of omap entries independently. We call this config
+osd_recovery_max_omap_entries_per_chunk here with the default number
+of 64000.
+
+Signed-off-by: Wanlong Gao <wanlong.gao at easystack.cn>
+---
+ src/common/config_opts.h     | 1 +
+ src/osd/ReplicatedBackend.cc | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/src/common/config_opts.h
++++ b/src/common/config_opts.h
+@@ -749,6 +749,7 @@ OPTION(osd_recovery_delay_start, OPT_FLO
+ OPTION(osd_recovery_max_active, OPT_INT, 3)
+ OPTION(osd_recovery_max_single_start, OPT_INT, 1)
+ OPTION(osd_recovery_max_chunk, OPT_U64, 8<<20)  // max size of push chunk
++OPTION(osd_recovery_max_omap_entries_per_chunk, OPT_U64, 64000) // max number of omap entries per chunk; 0 to disable limit
+ OPTION(osd_copyfrom_max_chunk, OPT_U64, 8<<20)   // max size of a COPYFROM chunk
+ OPTION(osd_push_per_object_cost, OPT_U64, 1000)  // push cost per object
+ OPTION(osd_max_push_cost, OPT_U64, 8<<20)  // max size of push message
+--- a/src/osd/ReplicatedBackend.cc
++++ b/src/osd/ReplicatedBackend.cc
+@@ -1985,7 +1985,9 @@ int ReplicatedBackend::build_push_op(con
+ 	 iter->valid();
+ 	 iter->next(false)) {
+       if (!out_op->omap_entries.empty() &&
+-	  available <= (iter->key().size() + iter->value().length()))
++	  ((cct->_conf->osd_recovery_max_omap_entries_per_chunk > 0 &&
++	    out_op->omap_entries.size() >= cct->_conf->osd_recovery_max_omap_entries_per_chunk) ||
++	   available <= iter->key().size() + iter->value().length()))
+ 	break;
+       out_op->omap_entries.insert(make_pair(iter->key(), iter->value()));
+ 
diff --git a/debian/patches/rocksdb-flags.patch b/debian/patches/rocksdb-flags.patch
deleted file mode 100644
index 68f6671..0000000
--- a/debian/patches/rocksdb-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Ensure that -momit-leaf-frame-pointer is only used on architectures that support it
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/facebook/rocksdb/pull/1019
-
---- a/src/rocksdb/Makefile
-+++ b/src/rocksdb/Makefile
-@@ -84,7 +84,8 @@ endif
- # compile with -O2 if debug level is not 2
- ifneq ($(DEBUG_LEVEL), 2)
- OPT += -O2 -fno-omit-frame-pointer
--ifneq ($(MACHINE),ppc64) # ppc64 doesn't support -momit-leaf-frame-pointer
-+# Skip for archs that don't support -momit-leaf-frame-pointer
-+ifeq (,$(shell $(CXX) -fsyntax-only -momit-leaf-frame-pointer -xc /dev/null 2>&1))
- OPT += -momit-leaf-frame-pointer
- endif
- endif
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index 5eca0d1..2369611 100644
--- a/debian/patches/sleep-recover.patch
+++ b/debian/patches/sleep-recover.patch
@@ -6,7 +6,7 @@ Description: fix fuse-client hang after wake-up from suspend.
 
 --- a/src/client/Client.cc
 +++ b/src/client/Client.cc
-@@ -11918,6 +11918,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -12014,6 +12014,7 @@ void Client::ms_handle_remote_reset(Conn
  	case MetaSession::STATE_OPEN:
  	  ldout(cct, 1) << "reset from mds we were open; mark session as stale" << dendl;
  	  s->state = MetaSession::STATE_STALE;
diff --git a/debian/patches/tests-disable.patch b/debian/patches/tests-disable.patch
index 7012f49..f03242a 100644
--- a/debian/patches/tests-disable.patch
+++ b/debian/patches/tests-disable.patch
@@ -13,14 +13,15 @@ Description: disable tests that depend on network...
  check_SCRIPTS += \
  	test/ceph_objectstore_tool.py \
  	test/test-ceph-helpers.sh \
-@@ -94,6 +95,7 @@ check_SCRIPTS += \
- 	test/libradosstriper/rados-striper.sh \
- 	test/test_objectstore_memstore.sh \
-         test/test_pidfile.sh
-+endif
+@@ -96,6 +97,8 @@ check_SCRIPTS += \
+         test/test_pidfile.sh \
+ 	test/test_subman.sh
  
++endif
++
  EXTRA_DIST += \
  	$(srcdir)/test/python/brag-client/setup.py \
+ 	$(srcdir)/test/python/brag-client/tox.ini \
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1349,6 +1349,13 @@ AC_LANG_POP([C++])

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



More information about the Pkg-ceph-commits mailing list