diff options
Diffstat (limited to 'sys-cluster/ceph')
| -rw-r--r-- | sys-cluster/ceph/Manifest | 6 | ||||
| -rw-r--r-- | sys-cluster/ceph/ceph-12.2.8-r1.ebuild (renamed from sys-cluster/ceph/ceph-12.2.8.ebuild) | 4 | ||||
| -rw-r--r-- | sys-cluster/ceph/ceph-13.2.2-r2.ebuild (renamed from sys-cluster/ceph/ceph-13.2.2-r1.ebuild) | 13 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph.initd-r9 | 97 | ||||
| -rw-r--r-- | sys-cluster/ceph/files/ceph.logrotate-r2 | 33 |
5 files changed, 147 insertions, 6 deletions
diff --git a/sys-cluster/ceph/Manifest b/sys-cluster/ceph/Manifest index 40e4146016f1..49e4d9a00e70 100644 --- a/sys-cluster/ceph/Manifest +++ b/sys-cluster/ceph/Manifest @@ -32,8 +32,10 @@ AUX ceph.confd-r4 1502 BLAKE2B 51b3d14ce7078a1ba3c458e3c028ceb8b7de02f8187b242c8 AUX ceph.initd-r2 958 BLAKE2B 9aeda4d2a0bad2fc1c190b19b78dd165230aeef932a5335038e650439ff3420a41d2a43ac527fadf700919ba9944b6da551b2fc5a665f915104717ef45474421 SHA512 6f42b8540797d3f55d64b9842e190ca2973c1779c720b7c9923b8bcc06dddf95672bee066275599e4feafeff38652235746433305dd4d7df8ad086a8deb960c0 AUX ceph.initd-r7 2197 BLAKE2B 7df3ab975cd14a3cc782ed58f8e6c2f0bfdc3f1b96383400490d7cab27b4d5afa6381cdb02843c1bbfe30f62e5d801ccecf2b61178013855e13ec504da84aa4c SHA512 93890b9e049ff5925ce56b524389873e22560315bf25c40ac86ec11dd2375d184215e7a217d863d4e32bb817a3e0577fdea71a76bb5d5c28ecbeb8544f1b763c AUX ceph.initd-r8 2363 BLAKE2B 43dd8f5eb9516b76609a91b1884cbe81d3afbd7634bc39987ecceab612a431e6b967d07c9b7d4a02352fe6545d999eaf1a137bb8d49865830a865ff2ed979186 SHA512 9061c97848e1826ae731202c763d8464f09dff013ae5855ce698d839f99d5184a533c3a81bba223d8f50051573e1fec92e915db32b26ac278b01bf17406cbba8 +AUX ceph.initd-r9 2435 BLAKE2B 2e1246f9d409bbe4d2895e9747490ddd108ef22c2060e151944ad2bda1e7ae13d61330cf9f33ec4900eb4fd4a26ff454dd081869901d21bff8309bf8db6d7533 SHA512 c7f0dd45bbada67e93b2e1acdafdb0ccd1de107d9d582b6b83889c5e0f91e524ea1324ab21e96d4c56d6016be6fed718a7791695c95c68813c6b9d6d3dc2a384 AUX ceph.logrotate 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae AUX ceph.logrotate-r1 427 BLAKE2B 9677f1a2a4872addff71527c800dd06bf65e18b589de3869e2a742c43070de789d5089f8739367efb913a64aeec5a8b82f47c129fac580e7c34e4f8cdc8b7332 SHA512 6edace611f46683ca3b8d2154b86ec77cc241909704e0362b728a5f51c2a809c22e83d69df0d58ec6b3a6b8dc8ef2518c220cac920f51e63fe668cdfe1b48bae +AUX ceph.logrotate-r2 545 BLAKE2B ef7dab92aa5fbbe7f5d5418feaae1a1f4400dce08ca4484fe5889888f4dcb6d180bfb5888d5c7d6d9bc32bb5c58443fb83c1cb4613a2810cab45e8a74c421279 SHA512 c30edd67b7cc064f09d4e02bac68a0aa26827d8d4e3c027393932587e8ce782893b93b53d7165d361602b29c90ef3d6b755e79d11a1edb054e0172decd4e627b AUX envd-tcmalloc 48 BLAKE2B 4a0799ac6bbedfe5e701eead67600312d86f06143dbfd11d2c594c03d09bf13dfa645e5a0bde1189211ad20036dc4fcfce6758d3a5829d943eb337cc65783af9 SHA512 d180b1a888ec6d870ff523a3b10fd00eca479ee2586a236458af5ffaba21c84e7b8098da6d4bc08fb86c82c61a861dd3c3596a01063d734c329a92808682fc8c AUX make-node-frontend-tarball.bash 3196 BLAKE2B 1779c8fe924d8a341bcf922da310c9e3543dd9875db79b2f08fd99419fc2a693e24a5d0c36e7db7b9c46f02bb78b51359e844c8265ff266e8a931a32b877b665 SHA512 4c13ebc9f2a7ba3d45a01cd72135a57b2dc6ad3edfe06a05645957c5522a053be940782f1148c117d8bf785937655083d3d1c74668e8c72d75ae000888a65d85 AUX rbdmap.initd 2373 BLAKE2B b88d79efc722e2de3d1f0269664a976ed45fbb0a1c9d46fcfd058ea64d3ae7fe27d13455f2ac5ca06663d77cfac1d2f9d86d12bba926541042ac09a8778a3a52 SHA512 bbd48d6987e52eaf6d02bccf3aecd06596465af4d3ac93063f9a814106de162a27bf1a33ae1646e669efb3c754f3ba57f395523293ad643b0d81ee588252216b @@ -50,8 +52,8 @@ DIST ceph-13.2.2.tar.gz 90840817 BLAKE2B db5933f358a1ae6888030bca7522e20545a2e10 EBUILD ceph-10.2.10-r2.ebuild 7629 BLAKE2B 1aa3f1ada65198fa2591c51871c76158d60f64f2e631cdd3c8e87e7d5e76812365db79321ce01d642a400e5a2656aed57876ab2fa9713723ec3f88150ea59056 SHA512 f735d0c6642e80ce689a00719d4225effc113fc537668178a95914471065fa95dd65f21ba55cea2075c83541a74ceca4309097d86d3e16db3f8a6d5eefc54638 EBUILD ceph-10.2.3-r2.ebuild 6108 BLAKE2B fa77d99bce7fbc4cc135a0f705551564e484659a5471d87edf9d412ca4b6f0d58b0f6f0f217a9487660f5040b0b5c73afcbb6b8e9d0ab9d2c087710f388dac52 SHA512 d0bfa7305db9b82be225871b1784a4b33bc7d8ff32a1cfabf441592ac9a5f161efb8df4bb06ed15ac56d61108c4a379c7ac30f8ef1d27b144123bc0f1d8f681f EBUILD ceph-12.2.7.ebuild 7886 BLAKE2B ce57a94c7a55e88ecc8729fc3a46433854d65d222561b418416b3aab52c689cca2487304b4925a070834e75e3bf82d82dded2207683d4374fd7314d8fe0aeb36 SHA512 69b46ff16141c2efeb0e650b3f0f48905608f33ca8316a6b394262cfb12d54b65ec07a5805053aae71533f5eb62314d5435f25a835635b7d3fc13666865d0615 -EBUILD ceph-12.2.8.ebuild 7883 BLAKE2B c07770b4b606ff78e362d0d3d6a8121f02e63e2b19c7f7150641d9832827df1cef960b31f16f24524e573081f6a389041933344e315ee42ef2d194ac1544311e SHA512 d20e6f115d0a56885045e5955c5cd8d1bb0a36ab28255581d76f3fcffb5b787c030f1454ad296396dc1fabd3193410cc3d0b1d0c6888b684d53e104e0432ab73 +EBUILD ceph-12.2.8-r1.ebuild 7886 BLAKE2B 3be53d0061849ec367a2612bf6a67b94b97eb7e3f1ab2902eddbfe6e45bd4065fe38ad41e3306b83bb6a622854efa8239d2ff716933e59bf06d343fe341823d2 SHA512 c96e0af6586053b8ff827c049acc8e6cafc2ec31052ed90d2b1d6b3f4daa30ffd41d162eba3aa279b2a07190ed21840032589f88a21be730d06885814eb5f4a5 EBUILD ceph-12.2.9-r1.ebuild 8026 BLAKE2B 99ae7bab9bc17382c9226f966101cb6a6315403494c83e8973d12b1bd669517a103c52a003f8dfbe487a6558b138200a34eafe6ccf96080915b0344ab78074a4 SHA512 cc49eec85c6010d7cda157fa8adfe92db10946474fa36a4e75452c2f66004f2a3c65c75ccfb885e50f0009bd38ccbf23755b95223f4ada974000986e920bf79b EBUILD ceph-13.2.1-r1.ebuild 9212 BLAKE2B dc1bad7c2e864edcd301097937894aa58abbadbcee9b2cd6d33b10c2366ac5bc9000460465910bf72b8c30a60b74a6be8ccc7591c1b9ddbc912182dd4dc4179f SHA512 365777bb2ebff564a503a6816e257c95ef0e3414f274b9613acb561d5744738b43aebb8488e09da5d230ee59e02003dc560f6216531dbb04c6c6a172475f011d -EBUILD ceph-13.2.2-r1.ebuild 9616 BLAKE2B 638a01ded7322e425d0ca135edae98414ac5e7b7bb24249c4955ce2cb5c4d716bc23a6f9ecd7a405d8c2730d8a77560bd0654aa9230b24edc67cbc3658473859 SHA512 a5d8ec64b9529ed700a1a39b7a7a76839a392a66ba244f12231f60038e5dc5ae49d5625a10c8821f2f2bd59b4c4b7f16d754b6034e7793706050cffe784161f3 +EBUILD ceph-13.2.2-r2.ebuild 9935 BLAKE2B 96d852665ac14c07e1ae9d86cbf04b464cb90929a0a0f2cef9ed9e3bc6c14df72ad96ed6570d692324d8d1699fa552713d7c9f3d764bbd9a27a838129adff275 SHA512 482b5c17c20a04a41e9574ae4d3e93d35c990872d97cead7afb6da8d2cb4ba45cbb647f412faacb66b74d9e561748652b7c2d19baac6f596b87aeb8b4fe89e6e MISC metadata.xml 1730 BLAKE2B 0cf24323ef1e88d95e448ecaa2df8a4b2a1ac9baf3f433931cd588bdb34b2f268a280a0756402787c73e4ac33dceb60042bafee1d3124dc6e98ba33abc541c73 SHA512 e54693fd32f6ecc16ca244067ce1ebf63ea5939926be2466a9d88a5373b25651bb5c25984ee6dbeecf0099be0988f002ed824b874c5a308fd4fbe35b87dcb53a diff --git a/sys-cluster/ceph/ceph-12.2.8.ebuild b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild index 56f05c940aa1..5ccb12358e2f 100644 --- a/sys-cluster/ceph/ceph-12.2.8.ebuild +++ b/sys-cluster/ceph/ceph-12.2.8-r1.ebuild @@ -258,14 +258,14 @@ src_install() { newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate ${PN} + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat fowners -R ceph:ceph /var/lib/ceph /var/log/ceph newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} newconfd "${FILESDIR}/${PN}.confd-r4" ${PN} insinto /etc/sysctl.d diff --git a/sys-cluster/ceph/ceph-13.2.2-r1.ebuild b/sys-cluster/ceph/ceph-13.2.2-r2.ebuild index acdd6899e458..3035155be5e3 100644 --- a/sys-cluster/ceph/ceph-13.2.2-r1.ebuild +++ b/sys-cluster/ceph/ceph-13.2.2-r2.ebuild @@ -167,6 +167,15 @@ user_setup() { } pkg_pretend() { + if use cephfs; then + eerror "Cephfs support is broken in 13.2.2, please mask ${PF} if" + eerror "you need cephfs support: " + eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask" + eerror + eerror "See https://bugs.gentoo.org/670592 for more information" + die "CephFS support is currently broken" + fi + check-reqs_export_vars check-reqs_pkg_pretend } @@ -315,14 +324,14 @@ src_install() { newexe "${CMAKE_BUILD_DIR}/bin/init-ceph" ceph_init.sh insinto /etc/logrotate.d/ - newins "${FILESDIR}"/ceph.logrotate-r1 ${PN} + newins "${FILESDIR}"/ceph.logrotate-r2 ${PN} keepdir /var/lib/${PN}{,/tmp} /var/log/${PN}/stat fowners -R ceph:ceph /var/lib/ceph /var/log/ceph newinitd "${FILESDIR}/rbdmap.initd" rbdmap - newinitd "${FILESDIR}/${PN}.initd-r8" ${PN} + newinitd "${FILESDIR}/${PN}.initd-r9" ${PN} newconfd "${FILESDIR}/${PN}.confd-r4" ${PN} insinto /etc/sysctl.d diff --git a/sys-cluster/ceph/files/ceph.initd-r9 b/sys-cluster/ceph/files/ceph.initd-r9 new file mode 100644 index 000000000000..cfbd58e4b571 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.initd-r9 @@ -0,0 +1,97 @@ +#!/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:=/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() { + 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 + 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}" + fi + + checkpath -m 0755 -o "${user}:${group}" -d $(dirname "${log_file}") + + supervise_daemon_args="${supervise_daemon_args} --${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: diff --git a/sys-cluster/ceph/files/ceph.logrotate-r2 b/sys-cluster/ceph/files/ceph.logrotate-r2 new file mode 100644 index 000000000000..74d96e238231 --- /dev/null +++ b/sys-cluster/ceph/files/ceph.logrotate-r2 @@ -0,0 +1,33 @@ +# +# /etc/logrotate.d/ceph +# + +/var/log/ceph/*.log +{ + rotate 7 + daily + compress + sharedscripts + prerotate + for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do + ceph --admin-daemon /run/ceph/${dmn} log flush 2>/dev/null >/dev/null + done + endscript + postrotate + for dmn in $(cd /run/ceph && ls *.asok 2>/dev/null); do + ceph --admin-daemon /run/ceph/${dmn} log reopen 2>/dev/null >/dev/null + done + endscript + missingok +} + +/var/log/ceph/console/*.log +{ + rotate 7 + daily + compress + missingok + copytruncate +} +# +# vim:ft=conf:ts=4:sts=4:sw=4:noet: |