summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>2017-10-22 18:47:00 +0200
committerPatrice Clement <monsieurp@gentoo.org>2017-11-05 16:38:58 +0100
commit1e215f2aa665a692dd99b4dbd2f8d2bd437cfc9a (patch)
treeb8ac36acaa3874f50100dab14830633c36e25336 /sys-cluster
parentsys-cluster/maui: remove unused patches. (diff)
downloadgentoo-1e215f2aa665a692dd99b4dbd2f8d2bd437cfc9a.tar.gz
gentoo-1e215f2aa665a692dd99b4dbd2f8d2bd437cfc9a.tar.bz2
gentoo-1e215f2aa665a692dd99b4dbd2f8d2bd437cfc9a.zip
sys-cluster/ceph: remove unused patche/files.
Closes: https://github.com/gentoo/gentoo/pull/6014
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch92
-rw-r--r--sys-cluster/ceph/files/ceph-mon_at.service19
-rw-r--r--sys-cluster/ceph/files/ceph.initd-r1.139
-rw-r--r--sys-cluster/ceph/files/ceph.target4
4 files changed, 0 insertions, 154 deletions
diff --git a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch b/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
deleted file mode 100644
index 3202de3cbe98..000000000000
--- a/sys-cluster/ceph/files/ceph-10.2.6-radosgw-swift-clean-up-flush-newline-behavior.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 39848e41b7c517cc5faab1ccf77c2804fd7d2628 Mon Sep 17 00:00:00 2001
-From: Marcus Watts <mwatts@redhat.com>
-Date: Wed, 11 Jan 2017 00:06:15 -0500
-Subject: [PATCH] radosgw/swift: clean up flush / newline behavior.
-
-The current code emits a newline after swift errors, but fails
-to account for it when it calculates 'content-length'. This results in
-some clients (go github.com/ncw/swift) producing complaints about the
-unsolicited newline such as this,
- Unsolicited response received on idle HTTP channel starting with "\n"; err=<nil>
-
-This logic eliminates the newline on flush. This makes the content length
-calculation correct and eliminates the stray newline.
-
-There was already existing separator logic in the rgw plain formatter
-that can emit a newline at the correct point. It had been checking
-"len" to decide if previous data had been emitted, but that's reset to 0
-by flush(). So, this logic adds a new per-instance variable to separately
-track state that it emitted a previous item (and should emit a newline).
-
-Fixes: http://tracker.ceph.com/issues/18473
-Signed-off-by: Marcus Watts <mwatts@redhat.com>
-Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
-(cherry picked from commit 5f229d6a33eae4906f22cdb90941835e47ee9f02)
----
- src/rgw/rgw_formats.cc | 11 +++++++----
- src/rgw/rgw_formats.h | 1 +
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/rgw/rgw_formats.cc b/src/rgw/rgw_formats.cc
-index 698ec96..61e9b66 100644
---- a/src/rgw/rgw_formats.cc
-+++ b/src/rgw/rgw_formats.cc
-@@ -25,6 +25,7 @@ RGWFormatter_Plain::RGWFormatter_Plain(const bool ukv)
- : buf(NULL),
- len(0),
- max_len(0),
-+ wrote_something(false),
- min_stack_level(0),
- use_kv(ukv)
- {
-@@ -41,7 +42,7 @@ void RGWFormatter_Plain::flush(ostream& os)
- return;
-
- if (len) {
-- os << buf << "\n";
-+ os << buf;
- os.flush();
- }
-
-@@ -156,13 +157,14 @@ void RGWFormatter_Plain::dump_format_va(const char *name, const char *ns, bool q
- vsnprintf(buf, LARGE_SIZE, fmt, ap);
-
- const char *eol;
-- if (len) {
-+ if (wrote_something) {
- if (use_kv && entry.is_array && entry.size > 1)
- eol = ", ";
- else
- eol = "\n";
- } else
- eol = "";
-+ wrote_something = true;
-
- if (use_kv && !entry.is_array)
- write_data("%s%s: %s", eol, name, buf);
-@@ -268,10 +270,11 @@ void RGWFormatter_Plain::dump_value_int(const char *name, const char *fmt, ...)
- va_end(ap);
-
- const char *eol;
-- if (len)
-+ if (wrote_something) {
- eol = "\n";
-- else
-+ } else
- eol = "";
-+ wrote_something = true;
-
- if (use_kv && !entry.is_array)
- write_data("%s%s: %s", eol, name, buf);
-diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h
-index 9df5251..1c5afd1 100644
---- a/src/rgw/rgw_formats.h
-+++ b/src/rgw/rgw_formats.h
-@@ -56,6 +56,7 @@ class RGWFormatter_Plain : public Formatter {
- std::list<struct plain_stack_entry> stack;
- size_t min_stack_level;
- bool use_kv;
-+ bool wrote_something;
- };
-
- class RGWFormatterFlusher {
diff --git a/sys-cluster/ceph/files/ceph-mon_at.service b/sys-cluster/ceph/files/ceph-mon_at.service
deleted file mode 100644
index 4f54cc158c5b..000000000000
--- a/sys-cluster/ceph/files/ceph-mon_at.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Ceph cluster monitor daemon
-After=network-online.target
-Wants=network-online.target
-
-# According to:
-# http://www.freedesktop.org/wiki/Software/systemd/NetworkTarget
-# these can be removed once ceph-mon will dynamically change network
-# configuration.
-After=network-online.target local-fs.target
-Wants=network-online.target local-fs.target
-PartOf=ceph.target
-
-[Service]
-Environment=CLUSTER=ceph
-ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id %i
-
-[Install]
-WantedBy=ceph.target
diff --git a/sys-cluster/ceph/files/ceph.initd-r1.1 b/sys-cluster/ceph/files/ceph.initd-r1.1
deleted file mode 100644
index bb603259715d..000000000000
--- a/sys-cluster/ceph/files/ceph.initd-r1.1
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/openrc-run
-
-ceph_conf="${ceph_conf:-/etc/ceph/ceph.conf}"
-extra_commands="reload"
-daemon_type="${RC_SVCNAME#ceph-}"
-daemon_type="${daemon_type%.*}"
-daemon_id="${RC_SVCNAME#ceph-*.}"
-daemon_id="${daemon_id:-0}"
-command="/usr/bin/ceph-${daemon_type}"
-pidfile="/run/ceph/${daemon_type}.${daemon_id}.pid"
-command_args="-i ${daemon_id} --pid-file ${pidfile} -c ${ceph_conf}"
-
-depend() {
- after net ntpd ntp-client chronyd
- before netmount
-}
-
-is_type_valid() {
- case ${daemon_type} in
- mon|mds|osd) return 0;;
- *) return 1;;
- esac
-}
-
-start_pre() {
- checkpath -d -q -o ceph "$(dirname "${pidfile}")"
- if ! is_type_valid ;then
- eerror "Please give valid Ceph Server Type: mds, mon, osd"
- return 1
- fi
-}
-
-reload() {
- ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
- start-stop-daemon --signal 1 ${start_stop_daemon_args} --pidfile "${pidfile}"
- eend $?
-}
-
-# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
diff --git a/sys-cluster/ceph/files/ceph.target b/sys-cluster/ceph/files/ceph.target
deleted file mode 100644
index 60734baff689..000000000000
--- a/sys-cluster/ceph/files/ceph.target
+++ /dev/null
@@ -1,4 +0,0 @@
-[Unit]
-Description=ceph target allowing to start/stop all ceph*@.service instances at once
-[Install]
-WantedBy=multi-user.target