[Pkg-ceph-commits] [ceph] 02/02: New upstream release 10.2.6
James Downing Page
jamespage at moszumanska.debian.org
Thu Mar 9 09:30:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu/yakkety
in repository ceph.
commit 9aa40efb5c6af05d71c6999bd4c78851b57141c1
Author: James Page <james.page at ubuntu.com>
Date: Wed Mar 8 14:39:15 2017 +0000
New upstream release 10.2.6
Dropped patches:
osd-limit-omap-data-in-push-op.patch
rgw_rados-creation_time.patch
All other patches refreshed.
---
debian/changelog | 9 +++++
debian/patches/disable-openssl-linking.patch | 2 +-
debian/patches/fix-argparse-defaults.patch | 2 +-
.../patches/osd-limit-omap-data-in-push-op.patch | 40 ----------------------
debian/patches/rgw_rados-creation_time.patch | 32 -----------------
debian/patches/series | 2 --
debian/patches/sleep-recover.patch | 2 +-
7 files changed, 12 insertions(+), 77 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 916ca87..864d1a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ceph (10.2.6-0ubuntu0.16.10.1) UNRELEASED; urgency=medium
+
+ * New upstream stable point release (LP: #1671117):
+ - d/p/osd-limit-omap-data-in-push-op.patch,rgw_rados-creation_time.patch:
+ Dropped, included upstream.
+ - d/p/*: Refresh.
+
+ -- James Page <james.page at ubuntu.com> Wed, 08 Mar 2017 14:33:56 +0000
+
ceph (10.2.5-0ubuntu0.16.10.1) yakkety; urgency=medium
* New upstream stable release (LP: #1649856):
diff --git a/debian/patches/disable-openssl-linking.patch b/debian/patches/disable-openssl-linking.patch
index 9fe7e31..844938d 100644
--- a/debian/patches/disable-openssl-linking.patch
+++ b/debian/patches/disable-openssl-linking.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
--- a/src/rgw/Makefile.am
+++ b/src/rgw/Makefile.am
-@@ -133,8 +133,7 @@ libcivetweb_la_SOURCES = \
+@@ -136,8 +136,7 @@ libcivetweb_la_SOURCES = \
libcivetweb_la_CXXFLAGS = ${CIVETWEB_INCLUDE} -fPIC -Woverloaded-virtual \
${AM_CXXFLAGS}
diff --git a/debian/patches/fix-argparse-defaults.patch b/debian/patches/fix-argparse-defaults.patch
index 1703b31..5e25985 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
-@@ -4477,6 +4477,7 @@ def parse_args(argv):
+@@ -4515,6 +4515,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
deleted file mode 100644
index 918f158..0000000
--- a/debian/patches/osd-limit-omap-data-in-push-op.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-@@ -748,6 +748,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/rgw_rados-creation_time.patch b/debian/patches/rgw_rados-creation_time.patch
deleted file mode 100644
index c5e51fe..0000000
--- a/debian/patches/rgw_rados-creation_time.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: weiqiaomiao <wei.qiaomiao at zte.com.cn>
-Subject: [PATCH] rgw: for the create_bucket api, if the input creation_time is
- zero, we should set it to 'now"
-Forwarded: yes
-Origin: upstream, https://github.com/ceph/ceph/commit/16c1a7d03abc8042f92b9f62ae7e228d19f74b2e
-Bug: http://tracker.ceph.com/issues/16597
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1587261
-
-Fixes: http://tracker.ceph.com/issues/16597
-
-Signed-off-by: weiqiaomiao <wei.qiaomiao at zte.com.cn>
----
- src/rgw/rgw_rados.cc | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
---- a/src/rgw/rgw_rados.cc
-+++ b/src/rgw/rgw_rados.cc
-@@ -5153,10 +5153,11 @@ int RGWRados::create_bucket(RGWUserInfo&
- info.num_shards = bucket_index_max_shards;
- info.bucket_index_shard_hash_type = RGWBucketInfo::MOD;
- info.requester_pays = false;
-- if (real_clock::is_zero(creation_time))
-- creation_time = ceph::real_clock::now(cct);
-- else
-+ if (real_clock::is_zero(creation_time)) {
-+ info.creation_time = ceph::real_clock::now(cct);
-+ } else {
- info.creation_time = creation_time;
-+ }
- ret = put_linked_bucket_info(info, exclusive, ceph::real_time(), pep_objv, &attrs, true);
- if (ret == -EEXIST) {
- /* we need to reread the info and return it, caller will have a use for it */
diff --git a/debian/patches/series b/debian/patches/series
index c3be6a0..5533f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,5 +16,3 @@ fix-argparse-defaults.patch
fix-cycles-arch.patch
skip-setup.py-makefiles.patch
disable-openssl-linking.patch
-osd-limit-omap-data-in-push-op.patch
-rgw_rados-creation_time.patch
diff --git a/debian/patches/sleep-recover.patch b/debian/patches/sleep-recover.patch
index d7ee410..658b69b 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
-@@ -12020,6 +12020,7 @@ void Client::ms_handle_remote_reset(Conn
+@@ -12061,6 +12061,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;
--
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