[Pkg-ceph-commits] [ceph] 05/05: d/p/32bit-compat.patch, tasksmax-infinity.patch: Dropped, included upstream.
James Downing Page
jamespage at moszumanska.debian.org
Thu Apr 14 09:10:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.
commit b55bd7d74b19225ca8e5b1f062d28e968392f1ce
Author: James Page <james.page at ubuntu.com>
Date: Thu Apr 14 10:07:39 2016 +0100
d/p/32bit-compat.patch,tasksmax-infinity.patch: Dropped, included upstream.
---
debian/changelog | 2 +
debian/patches/32bit-compat.patch | 55 --------------------------
debian/patches/series | 2 -
debian/patches/tasksmax-infinity.patch | 71 ----------------------------------
4 files changed, 2 insertions(+), 128 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 112376a..f39a020 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ceph (10.1.2-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release candidate for Ceph Jewel:
- FFe: http://pad.lv/1563714.
+ - d/p/32bit-compat.patch,tasksmax-infinity.patch: Dropped,
+ included upstream.
* d/ceph-common.postinst: Silence output of usermod call (LP: #1569249).
-- James Page <james.page at ubuntu.com> Tue, 12 Apr 2016 11:02:42 +0100
diff --git a/debian/patches/32bit-compat.patch b/debian/patches/32bit-compat.patch
deleted file mode 100644
index d16cf7c..0000000
--- a/debian/patches/32bit-compat.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 778506ed7d0efc9899d419cf31e0bf7e25cf9420 Mon Sep 17 00:00:00 2001
-From: "Adam C. Emerson" <aemerson at redhat.com>
-Date: Thu, 31 Mar 2016 14:50:06 -0400
-Subject: [PATCH 1/2] time: Change temporary variable types in time decode
-
-Since we're decoding 32-bit integers, just use uint32_t and then cast them to
-what utime_t expects.
-
-Fixes: http://tracker.ceph.com/issues/15330
-Signed-off-by: Adam C. Emerson <aemerson at redhat.com>
----
- src/common/ceph_time.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
---- a/src/common/ceph_time.h
-+++ b/src/common/ceph_time.h
-@@ -382,10 +382,13 @@ void encode(const std::chrono::time_poin
- template<typename Clock, typename Duration>
- void decode(std::chrono::time_point<Clock, Duration>& t,
- bufferlist::iterator& p) {
-- uint32_t s, ns;
-+ uint32_t s;
-+ uint32_t ns;
- ::decode(s, p);
- ::decode(ns, p);
-- struct timespec ts = {s, ns};
-+ struct timespec ts = {
-+ static_cast<time_t>(s),
-+ static_cast<long int>(ns)};
-
- t = Clock::from_timespec(ts);
- }
---- a/src/cls/rgw/cls_rgw_ops.h
-+++ b/src/cls/rgw/cls_rgw_ops.h
-@@ -180,7 +180,7 @@ struct rgw_cls_link_olh_op {
- ::encode(olh_epoch, bl);
- ::encode(log_op, bl);
- ::encode(bilog_flags, bl);
-- time_t t = ceph::real_clock::to_time_t(unmod_since);
-+ uint64_t t = ceph::real_clock::to_time_t(unmod_since);
- ::encode(t, bl);
- ::encode(unmod_since, bl);
- ::encode(high_precision_time, bl);
-@@ -198,9 +198,9 @@ struct rgw_cls_link_olh_op {
- ::decode(log_op, bl);
- ::decode(bilog_flags, bl);
- if (struct_v == 2) {
-- time_t t;
-+ uint64_t t;
- ::decode(t, bl);
-- unmod_since = ceph::real_clock::from_time_t(t);
-+ unmod_since = ceph::real_clock::from_time_t(static_cast<time_t>(t));
- }
- if (struct_v >= 3) {
- ::decode(unmod_since, bl);
diff --git a/debian/patches/series b/debian/patches/series
index 53f2f5b..afc110d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,4 @@ fix-cycles-arch.patch
rocksdb-flags.patch
skip-setup.py-makefiles.patch
disable-openssl-linking.patch
-32bit-compat.patch
drop-user-group-osd-prestart.patch
-tasksmax-infinity.patch
diff --git a/debian/patches/tasksmax-infinity.patch b/debian/patches/tasksmax-infinity.patch
deleted file mode 100644
index 89f5f3b..0000000
--- a/debian/patches/tasksmax-infinity.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 05cafcf19fb80dd2a76fdbbe5329bae53aa0def4 Mon Sep 17 00:00:00 2001
-From: James Page <james.page at ubuntu.com>
-Date: Tue, 5 Apr 2016 17:32:59 +0100
-Subject: [PATCH] Drop any systemd imposed process/thread limits
-
-If systemd has task accounting enabled, a default of 512 tasks
-will be applied to all systemd units.
-
-For ceph, this is way to low even for a modest cluster, so stop
-this restriction being applied and allow administrators to apply
-limits using sysctl.
-
-Signed-off-by: James Page <james.page at ubuntu.com>
----
- systemd/ceph-mds at .service | 1 +
- systemd/ceph-mon at .service | 1 +
- systemd/ceph-osd at .service | 1 +
- systemd/ceph-radosgw at .service | 1 +
- systemd/ceph-rbd-mirror at .service | 1 +
- 5 files changed, 5 insertions(+)
-
---- a/systemd/ceph-mds at .service
-+++ b/systemd/ceph-mds at .service
-@@ -15,6 +15,7 @@ PrivateDevices=yes
- ProtectHome=true
- ProtectSystem=full
- PrivateTmp=true
-+TasksMax=infinity
-
- [Install]
- WantedBy=ceph-mds.target
---- a/systemd/ceph-mon at .service
-+++ b/systemd/ceph-mon at .service
-@@ -21,6 +21,7 @@ PrivateDevices=yes
- ProtectHome=true
- ProtectSystem=full
- PrivateTmp=true
-+TasksMax=infinity
-
- [Install]
- WantedBy=ceph-mon.target
---- a/systemd/ceph-osd at .service
-+++ b/systemd/ceph-osd at .service
-@@ -15,6 +15,7 @@ ExecReload=/bin/kill -HUP $MAINPID
- ProtectHome=true
- ProtectSystem=full
- PrivateTmp=true
-+TasksMax=infinity
-
- [Install]
- WantedBy=ceph-osd.target
---- a/systemd/ceph-radosgw at .service
-+++ b/systemd/ceph-radosgw at .service
-@@ -14,6 +14,7 @@ PrivateDevices=yes
- ProtectHome=true
- ProtectSystem=full
- PrivateTmp=true
-+TasksMax=infinity
-
- [Install]
- WantedBy=ceph-radosgw.target
---- a/systemd/ceph-rbd-mirror at .service
-+++ b/systemd/ceph-rbd-mirror at .service
-@@ -17,6 +17,7 @@ PrivateTmp=true
- Restart=on-failure
- StartLimitInterval=30min
- StartLimitBurst=3
-+TasksMax=infinity
-
- [Install]
- WantedBy=ceph-rbd-mirror.target
--
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