From: "Patrick McLean" <chutzpah@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/
Date: Wed, 10 Aug 2022 20:21:19 +0000 (UTC) [thread overview]
Message-ID: <1660162876.9826b9703d7cff5d16537212334dacb0c21072ad.chutzpah@gentoo> (raw)
commit: 9826b9703d7cff5d16537212334dacb0c21072ad
Author: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 10 20:20:39 2022 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Aug 10 20:21:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9826b970
sys-cluster/ceph: Remove unused files
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
sys-cluster/ceph/files/ceph.logrotate | 18 -----
sys-cluster/ceph/files/rbdmap.initd | 122 ----------------------------------
2 files changed, 140 deletions(-)
diff --git a/sys-cluster/ceph/files/ceph.logrotate b/sys-cluster/ceph/files/ceph.logrotate
deleted file mode 100644
index df03f5e69a4b..000000000000
--- a/sys-cluster/ceph/files/ceph.logrotate
+++ /dev/null
@@ -1,18 +0,0 @@
-/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
-}
diff --git a/sys-cluster/ceph/files/rbdmap.initd b/sys-cluster/ceph/files/rbdmap.initd
deleted file mode 100644
index 9313cf658863..000000000000
--- a/sys-cluster/ceph/files/rbdmap.initd
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/sbin/openrc-run
-
-DESC="RBD Mapping:"
-RBDMAPFILE="/etc/ceph/rbdmap"
-
-extra_started_commands="reload"
-
-depend() {
- need localmount net
- before netmount
-}
-
-start() {
-
- if [ ! -f "${RBDMAPFILE}" ]; then
- ewarn "$DESC : No ${RBDMAPFILE} found."
- exit 0
- fi
-
- RET=0
- # Read /etc/ceph/rbdmap to create non-existant mapping
- while read DEV PARAMS; do
- case "$DEV" in
- ""|\#*)
- continue
- ;;
- */*)
- ;;
- *)
- DEV=rbd/$DEV
- ;;
- esac
- ebegin "${DESC} '${DEV}'"
- newrbd=""
- MAP_RV=""
- RET_OP=0
- OIFS=$IFS
- IFS=','
- for PARAM in ${PARAMS[@]}; do
- CMDPARAMS="${CMDPARAMS} --$(echo ${PARAM} | tr '=' ' ')"
- done
- IFS=$OIFS
- if [ ! -b /dev/rbd/${DEV} ]; then
- MAP_RV=$(rbd map ${DEV} ${CMDPARAMS} 2>&1)
- if [ $? -eq 0 ]; then
- newrbd="yes"
- else
- RET=$((${RET}+$?))
- RET_OP=1
- fi
- fi
- eend ${RET_OP} "${MAP_RV}"
-
- if [ "$newrbd" ]; then
- ## Mount new rbd
- MNT_RV=""
- mount --fake /dev/rbd/${DEV} >>/dev/null 2>&1 \
- && MNT_RV=$(mount -vn /dev/rbd/${DEV} 2>&1)
- [ -n "${MNT_RV}" ] && einfo "mount: ${MNT_RV}"
-
- ## post-mapping
- if [ -x "/etc/ceph/rbd.d/${DEV}" ]; then
- einfo "RBD Running post-map hook '/etc/ceph/rbd.d/${DEV}'"
- /etc/ceph/rbd.d/${DEV} map "/dev/rbd/${DEV}"
- fi
- fi
- done < ${RBDMAPFILE}
- eend ${RET}
-}
-
-stop() {
-
- RET=0
- ## Unmount and unmap all rbd devices
- if ls /dev/rbd[0-9]* >/dev/null 2>&1; then
- for DEV in /dev/rbd[0-9]*; do
- ## pre-unmapping
- for L in $(find /dev/rbd -type l); do
- LL="${L##/dev/rbd/}"
- if [ "$(readlink -f $L)" = "${DEV}" ] \
- && [ -x "/etc/ceph/rbd.d/${LL}" ]; then
- einfo "RBD pre-unmap: '${DEV}' hook '/etc/ceph/rbd.d/${LL}'"
- /etc/ceph/rbd.d/${LL} unmap "$L"
- break
- fi
- done
-
- ebegin "Unmapping RBD device: '${DEV}'"
- UMNT_RV=""
- UMAP_RV=""
- RET_OP=0
- MNT=$(findmnt --mtab --source ${DEV} --noheadings | awk '{print $1'})
- if [ -n "${MNT}" ]; then
- einfo "un-mounting '${MNT}'"
- UMNT_RV=$(umount "${MNT}" 2>&1)
- fi
- if mountpoint -q "${MNT}"; then
- ## Un-mounting failed.
- RET_OP=1
- RET=$((${RET}+1))
- else
- ## Un-mapping.
- UMAP_RV=$(rbd unmap $DEV 2>&1)
- if [ $? -ne 0 ]; then
- RET=$((${RET}+$?))
- RET_OP=1
- fi
- fi
- eend ${RET_OP} "${UMAP_RV}"
- [ -n "${UMNT_RV}" ] && einfo "${UMNT_RV}"
- done
- fi
- eend ${RET}
-}
-
-reload() {
- start
-}
-
-status() {
- rbd showmapped
-}
next reply other threads:[~2022-08-10 20:21 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-10 20:21 Patrick McLean [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-05 14:59 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/files/ Florian Schmaus
2024-10-15 21:46 Conrad Kostecki
2023-06-09 17:50 Patrick McLean
2023-05-02 21:01 Patrick McLean
2023-02-06 1:57 Patrick McLean
2022-09-29 18:34 Patrick McLean
2022-08-24 1:53 Patrick McLean
2022-08-12 22:13 Patrick McLean
2022-07-18 17:33 Patrick McLean
2022-05-05 22:51 Patrick McLean
2022-03-12 18:45 David Seifert
2021-10-26 17:49 Patrick McLean
2021-05-27 20:56 Patrick McLean
2021-03-26 18:32 Conrad Kostecki
2021-03-01 22:11 Conrad Kostecki
2021-02-04 19:59 Patrick McLean
2020-06-27 20:51 Aaron Bauman
2020-04-23 17:54 Patrick McLean
2019-04-20 1:29 Aaron Bauman
2019-03-25 23:59 Patrick McLean
2018-08-07 23:37 Patrick McLean
2017-11-05 15:39 Patrice Clement
2017-10-19 22:56 Patrick McLean
2017-07-31 16:30 Patrick McLean
2017-02-10 22:34 David Seifert
2017-02-10 1:23 Patrick McLean
2015-12-23 3:15 Yixun Lan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1660162876.9826b9703d7cff5d16537212334dacb0c21072ad.chutzpah@gentoo \
--to=chutzpah@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox