From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Dec 2017 18:23:20 +0000 Subject: gentoo resync : 06.12.2017 --- .../files/ceph-12.2.2-build-without-radosgw.patch | 34 +++++++++ sys-cluster/ceph/files/ceph.confd-r4 | 70 +++++++++++++++++ sys-cluster/ceph/files/ceph.initd-r6 | 87 ++++++++++++++++++++++ 3 files changed, 191 insertions(+) create mode 100644 sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch create mode 100644 sys-cluster/ceph/files/ceph.confd-r4 create mode 100644 sys-cluster/ceph/files/ceph.initd-r6 (limited to 'sys-cluster/ceph/files') diff --git a/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch b/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch new file mode 100644 index 000000000000..29257c4747d6 --- /dev/null +++ b/sys-cluster/ceph/files/ceph-12.2.2-build-without-radosgw.patch @@ -0,0 +1,34 @@ +From b00ac12f4045cd39ac9a436cf32d233d16bc3485 Mon Sep 17 00:00:00 2001 +From: Jason Dillaman +Date: Tue, 5 Dec 2017 09:58:04 -0500 +Subject: [PATCH] ceph-dencoder: moved RBD types outside of RGW preprocessor + guard + +Fixes: http://tracker.ceph.com/issues/22321 +Signed-off-by: Jason Dillaman +--- + src/test/encoding/types.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/test/encoding/types.h b/src/test/encoding/types.h +index c061e93bd58c..4cfcb15edff1 100644 +--- a/src/test/encoding/types.h ++++ b/src/test/encoding/types.h +@@ -405,6 +405,8 @@ TYPE(rgw_data_sync_info) + TYPE(rgw_data_sync_marker) + TYPE(rgw_data_sync_status) + ++#endif ++ + #ifdef WITH_RBD + #include "cls/rbd/cls_rbd.h" + TYPE(cls_rbd_parent) +@@ -416,8 +418,6 @@ TYPE(cls::rbd::MirrorImage) + TYPE(cls::rbd::MirrorImageMap) + #endif + +-#endif +- + #include "cls/lock/cls_lock_types.h" + TYPE(rados::cls::lock::locker_id_t) + TYPE_FEATUREFUL(rados::cls::lock::locker_info_t) diff --git a/sys-cluster/ceph/files/ceph.confd-r4 b/sys-cluster/ceph/files/ceph.confd-r4 new file mode 100644 index 000000000000..b8a0c930a495 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.confd-r4 @@ -0,0 +1,70 @@ +# /etc/conf.d/ceph: startup configurations for ceph + +# default ceph conf file +#ceph_conf="/etc/ceph/ceph.conf" + +# Set ulimits for Ceph services. +#rc_ulimit="-n 1048576 -u 1048576" + +# the directory under /run to store runtime information in +#rundir=/run/ceph + +# the user and group to run ceph as +#user="ceph" +#group="ceph" + +# tell openrc to use control groups to make sure everything gets killed +# properly on stop. Highly reccommended to leave this enabled. +rc_cgroup_cleanup=1 + +# settings for openrc supervisor for various ceph daemons +# +# defaults (can be overidden for each daemon) +# stderr and stdout values get .${id}-std{out,err}.log appended +# to the provided value +# +#respawn_delay=20 +#respawn_max=5 +#respawn_period=1800 +#stdout="/dev/null" +#stderr="/dev/null" + +# radosgw +#radosgw_respawn_max +#radosgw_respawn_delay=20 +#radosgw_respawn_period=1800 +#radosgw_stdout="/dev/null" +#radosgw_stderr="/dev/null" + +# mon +#mon_respawn_max=5 +#mon_respawn_delay=20 +#mon_respawn_period=1800 +#mon_stdout="/dev/null" +#mon_stderr="/dev/null" + +# osd +#osd_respawn_max=5 +#osd_respawn_delay=30 +#osd_respawn_period=1800 +#osd_stdout="/dev/null" +#osd_stderr="/dev/null" + +# mds +#mds_respawn_max=5 +#mds_respawn_delay=20 +#mds_respawn_period=1800 +#mds_stdout="/dev/null" +#mds_stderr="/dev/null" + +# mgr +#mgr_respawn_max=5 +#mgr_respawn_delay=20 +#mgr_respawn_period=1800 +#mgr_stdout="/dev/null" +#mgr_stderr="/dev/null" + +# initd stop timeout. +#CEPH_TERMTIMEOUT="TERM/120/KILL/5" +# +# vim:ft=gentoo-conf-d:ts=4:sts=4:sw=4:noet: diff --git a/sys-cluster/ceph/files/ceph.initd-r6 b/sys-cluster/ceph/files/ceph.initd-r6 new file mode 100644 index 000000000000..fd31b17eb5e3 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.initd-r6 @@ -0,0 +1,87 @@ +#!/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}" +: ${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}" +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:=/dev/null} +: ${stderr:=/dev/null} +: ${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() { + 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 + + local arg_name arg_val + for arg_name in std{out,err} respawn_{delay,max,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 + supervise_daemon_args="${supervise_daemon_args} --${arg_name//_/-}=${arg_val}.${daemon_id}-${arg_name}.log" + 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: -- cgit v1.2.3