[patch] 0001-sys-cluster-ceph-revbump-for-new-initscript-rev.patch

0001-sys-cluster-ceph-revbump-for-new-initscript-rev.patch (text/plain), 6.18 KB, created by Georgy Yakovlev on 2019-04-25 18:58:54 UTC

From 64b2531e61894a64eb4fa1587fb8f1616ff6fd19 Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <[e-mail]>
Date: Thu, 25 Apr 2019 11:50:33 -0700
Subject: [PATCH] sys-cluster/ceph: revbump for new initscript rev

Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Georgy Yakovlev <[e-mail]>
---
 ....2.12-r1.ebuild => ceph-12.2.12-r2.ebuild} |   2 +-
 ...13.2.5-r3.ebuild => ceph-13.2.5-r4.ebuild} |   2 +-
 ...14.2.0-r5.ebuild => ceph-14.2.0-r6.ebuild} |   2 +-
 sys-cluster/ceph/files/ceph.initd-r12         | 115 ++++++++++++++++++
 4 files changed, 118 insertions(+), 3 deletions(-)
 rename sys-cluster/ceph/{ceph-12.2.12-r1.ebuild => ceph-12.2.12-r2.ebuild} (99%)
 rename sys-cluster/ceph/{ceph-13.2.5-r3.ebuild => ceph-13.2.5-r4.ebuild} (99%)
 rename sys-cluster/ceph/{ceph-14.2.0-r5.ebuild => ceph-14.2.0-r6.ebuild} (99%)
 create mode 100644 sys-cluster/ceph/files/ceph.initd-r12

diff --git a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-12.2.12-r1.ebuild
rename to sys-cluster/ceph/ceph-12.2.12-r2.ebuild
index 783210078a8..5c5c0114085 100644
--- a/sys-cluster/ceph/ceph-12.2.12-r1.ebuild
+++ b/sys-cluster/ceph/ceph-12.2.12-r2.ebuild
@@ -274,7 +274,7 @@ src_install() {
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
 
 	insinto /etc/sysctl.d
diff --git a/sys-cluster/ceph/ceph-13.2.5-r3.ebuild b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-13.2.5-r3.ebuild
rename to sys-cluster/ceph/ceph-13.2.5-r4.ebuild
index d6e08fe9ba9..de0b1ea8ca7 100644
--- a/sys-cluster/ceph/ceph-13.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-13.2.5-r4.ebuild
@@ -296,7 +296,7 @@ src_install() {
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
 
 	insinto /etc/sysctl.d
diff --git a/sys-cluster/ceph/ceph-14.2.0-r5.ebuild b/sys-cluster/ceph/ceph-14.2.0-r6.ebuild
similarity index 99%
rename from sys-cluster/ceph/ceph-14.2.0-r5.ebuild
rename to sys-cluster/ceph/ceph-14.2.0-r6.ebuild
index 52a0a5582ab..4058c13647f 100644
--- a/sys-cluster/ceph/ceph-14.2.0-r5.ebuild
+++ b/sys-cluster/ceph/ceph-14.2.0-r6.ebuild
@@ -301,7 +301,7 @@ src_install() {
 	fowners -R ceph:ceph /var/lib/ceph /var/log/ceph
 
 	newinitd "${FILESDIR}/rbdmap.initd" rbdmap
-	newinitd "${FILESDIR}/${PN}.initd-r11" ${PN}
+	newinitd "${FILESDIR}/${PN}.initd-r12" ${PN}
 	newconfd "${FILESDIR}/${PN}.confd-r5" ${PN}
 
 	insinto /etc/sysctl.d
diff --git a/sys-cluster/ceph/files/ceph.initd-r12 b/sys-cluster/ceph/files/ceph.initd-r12
new file mode 100644
index 00000000000..4a90e3c3f98
--- /dev/null
+++ b/sys-cluster/ceph/files/ceph.initd-r12
@@ -0,0 +1,115 @@
+#!/sbin/openrc-run
+
+# make sure /etc/conf.d/ceph gets loaded for ceph-mon etc
+_CONFD_FILE="${RC_SERVICE%/*}/../conf.d/${RC_SVCNAME%-*}"
+if [ -r "${_CONFD_FILE}" ]; then
+	. "${_CONFD_FILE}" || exit 1
+fi
+
+: "${ceph_conf:=/etc/ceph/ceph.conf}"
+daemon_type="${RC_SVCNAME#ceph-}"
+daemon_type="${daemon_type%%.*}"
+daemon_id="${RC_SVCNAME#ceph-*.}"
+daemon_id="${daemon_id:-0}"
+: "${rundir:=/run/ceph}"
+: "${user:=ceph}"
+: "${group:=ceph}"
+: "${rc_ulimit:=-n 1048576 -u 1048576}"
+
+pidfile="${rundir}/supervisor-${daemon_type}.${daemon_id}.pid"
+daemon_pidfile="${rundir}/${daemon_type}.${daemon_id}.pid"
+
+command="/usr/bin/${RC_SVCNAME%%.*}"
+command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"
+extra_commands="${extra_commands} reload"
+command_args_foreground="--foreground"
+
+retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"
+start_stop_daemon_args="--user ${user} --group ${group}"
+supervise_daemon_args="--user ${user} --group ${group}"
+
+: "${supervisor:=supervise-daemon}"
+: "${stdout:=/var/log/ceph/ceph}"
+: "${stderr:=/var/log/ceph/ceph}"
+: "${respawn_delay:=10}"
+: "${respawn_max:=5}"
+: "${respawn_period:=1800}"
+
+: "${osd_respawn_delay:=15}"
+: "{osd_respawn_max:=10}"
+
+: "{radosgw_respawn_max:=5}"
+: "${radosgw_respawn_period:=30}"
+
+depend() {
+	use dns logger
+	after net ntpd ntp-client chronyd
+	before netmount
+}
+
+is_type_valid() {
+	case ${daemon_type} in
+		mon|mds|osd|mgr|radosgw) return 0;;
+		*) return 1;;
+	esac
+}
+
+start_pre() {
+	local log_dir
+	export CEPH_CONF="${ceph_conf}"
+
+	checkpath -d -q -o "${user}:${group}" "${rundir}"
+
+	if ! is_type_valid ;then
+		eerror "Please give valid Ceph Server Type: mds, mon, osd"
+		return 1
+
+	elif pgrep -f "[c]eph-${daemon_type} -i ${daemon_id} "; then
+		eerror "${daemon_type}.${daemon_id} is still running, refusing to start"
+		return 1
+	fi
+
+	if [ -n "${bluestore_osd_fsid}" ]; then
+		einfo "Mounting Bluestore"
+		ceph-volume lvm activate "${daemon_id}" "${bluestore_osd_fsid}" --no-systemd
+	fi
+
+	if [ "${daemon_type}" = radosgw ] && [ "${RADOSGW_WANT_NAME_PARAM}" = y ]; then
+		command_args="${command_args} --name client.${daemon_id}"
+	fi
+
+	local arg_name arg_val repl_arg_name
+	for arg_name in stdout stderr respawn_delay respawn_max respawn_period; do
+		eval arg_val="\${${daemon_type}_${arg_name}}"
+
+		if [ -z "${arg_val}" ]; then
+			eval arg_val="\${${arg_name}}"
+		else
+			eval "${arg_name}=\"${arg_val}\""
+		fi
+
+		if [ "${arg_name}" = "stderr" ] || [ "${arg_name}" = "stdout" ]; then
+			local log_file log_postfix
+			log_postfix=".${daemon_id}-${arg_name}.log"
+			log_file="${arg_val}"
+
+			if [ "${log_file}" != /dev/null ]; then
+				log_file="${log_file}${log_postfix}"
+
+				log_dir="$(dirname "${log_file}")"
+				checkpath -m 0755 -o "${user}:${group}" -d "${log_dir}"
+			fi
+
+			repl_arg_name="$(printf -- "%s\n" "${arg_name}" | tr _ -)"
+			supervise_daemon_args="${supervise_daemon_args} --${repl_arg_name}=${log_file}"
+		fi
+	done
+}
+
+reload() {
+	ebegin "Reloading Ceph ${daemon_type}.${daemon_id}"
+	start-stop-daemon --signal 1 "${start_stop_daemon_args}"
+	eend ${?}
+}
+
+# vim:ft=gentoo-init-d:ts=4:sts=4:sw=4:noet:
-- 
2.21.0