commit: e5d8a2daad136ff49181263ae3bb284ff9a8055c Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Dec 4 13:24:39 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Dec 4 13:27:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5d8a2da
sys-cluster/cman: Remove last-rited pkg Closes: https://bugs.gentoo.org/618050 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/base/package.use.stable.mask | 6 +- profiles/package.mask | 1 - sys-cluster/cman/Manifest | 2 - sys-cluster/cman/cman-3.1.5-r1.ebuild | 100 --------- sys-cluster/cman/cman-3.1.5.ebuild | 100 --------- sys-cluster/cman/cman-3.2.0.ebuild | 100 --------- sys-cluster/cman/files/cman.confd | 67 ------ sys-cluster/cman/files/cman.initd | 318 -------------------------- sys-cluster/cman/files/cman.initd-3.1.5-r1 | 349 ----------------------------- sys-cluster/cman/metadata.xml | 9 - 10 files changed, 1 insertion(+), 1051 deletions(-) diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 1924f17037c..276b56ec0e8 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -205,13 +205,9 @@ media-libs/libcaca java mono # dev-libs/opencryptoki will not be stabile any time soon (bug#510204) app-crypt/tpm-tools pkcs11 -# Sergey Popov <pinkb...@gentoo.org> (28 Oct 2013) -# sys-cluster/cman is still in ~arch. -sys-cluster/pacemaker cman - # Samuli Suominen <ssuomi...@gentoo.org> (01 Aug 2013) # The dependencies for these flags are still in ~arch. -sys-fs/lvm2 clvm cman +sys-fs/lvm2 clvm # Doug Goldstein <car...@gentoo.org> (12 Sep 2013) # Waiting on glusterfs maintainers in bug #484016 diff --git a/profiles/package.mask b/profiles/package.mask index 6e30134fc54..e5605fb3c44 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -427,7 +427,6 @@ app-admin/syslogread # Pacho Ramos <pa...@gentoo.org> (04 Nov 2018) # Upstream dead for many years and nobody taking care of them, bug #443842, # bug #618050. Removal in a month. -sys-cluster/cman sys-cluster/ccs sys-cluster/libdlm sys-cluster/fence-agents diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest deleted file mode 100644 index d2c92a8591f..00000000000 --- a/sys-cluster/cman/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST cluster-3.1.5.tar.gz 651449 BLAKE2B 7abee8c9df113b884a9e168bdcce904100d46e8346accd202c9ca43e6861a79da6d8826776dba657a182d73b84ecc19520b516c29975554c7d149e2b109599a3 SHA512 692888ed55c6bb7ebf3b3e792ec071b5fcff4c35c181c5b0c9296e8222c62e10f8a6344af391fbae8186b39cb31e674632bde77ebcc1fcab758657ae4264634a -DIST cluster-3.2.0.tar.gz 688411 BLAKE2B b1218e74bd0d9f1d25d8a01659d5a038f3a5380e6d6e04f02138d13ef3de1e3f96d6aac680c2858ac6bd0e830d227474af9ec82ea8bbefd3f33b88bbe2d5ffc6 SHA512 00620b89564c4f9b67b679695749cd7515f49af43ace6a565e32e020ee66db219f3db3f53420d6460ea8c1cab03258305735fe5db81aab3953777015119533e9 diff --git a/sys-cluster/cman/cman-3.1.5-r1.ebuild b/sys-cluster/cman/cman-3.1.5-r1.ebuild deleted file mode 100644 index ebddee75dd5..00000000000 --- a/sys-cluster/cman/cman-3.1.5-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit linux-info multilib toolchain-funcs versionator - -CLUSTER_RELEASE="${PV}" -MY_P="cluster-${CLUSTER_RELEASE}" - -MAJ_PV="$(get_major_version)" -MIN_PV="$(get_version_component_range 2-3)" - -DESCRIPTION="Cluster Manager" -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"; -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="dbus ldap" - -RDEPEND="dev-libs/libxml2 - dev-libs/libxslt - dbus? ( sys-apps/dbus ) - ldap? ( net-nds/openldap ) - sys-cluster/corosync - sys-cluster/openais - ~sys-cluster/libccs-${PV} - ~sys-cluster/libfence-${PV} - ~sys-cluster/libcman-${PV} - ~sys-cluster/libdlm-${PV} - ~sys-cluster/liblogthread-${PV} - !sys-cluster/dlm -" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.24" - -S="${WORKDIR}/${MY_P}" - -# TODO: -# * Gentoo'ise the init script - -src_configure() { - # cluster libs have their own separate packages - sed -i -e 's|lib||' "${S}/cman/Makefile" || die - sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die - sed -i -e 's|libs||' "${S}/config/Makefile" || die - sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die - sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die - sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die - - sed -i \ - -e 's|\(^all:.*\)depends |\1|' \ - config/tools/ccs_tool/Makefile \ - fence/fence{d,_node,_tool}/Makefile \ - cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \ - dlm/{tool,tests/usertest}/Makefile \ - || die "sed failed" - - if ! use ldap ; then - sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed" - fi - local myopts="" - use dbus || myopts="--disable_dbus" - ./configure \ - --cc=$(tc-getCC) \ - --cflags="-Wall" \ - --libdir=/usr/$(get_libdir) \ - --disable_kernel_check \ - --kernel_src=${KERNEL_DIR} \ - --somajor="$MAJ_PV" \ - --sominor="$MIN_PV" \ - --without_rgmanager \ - --without_bindings \ - ${myopts} \ - || die "configure problem" -} - -src_install() { - emake DESTDIR="${D}" install - - # we have to create it in the init.d script anyway - rmdir "${D}"/var/run/{cluster,} - - keepdir /var/{lib,log}/cluster - keepdir /etc/cluster/cman-notify.d - - rm -rf "${D}/usr/share/doc" - dodoc \ - doc/{usage.txt,cman_notify_template.sh} \ - config/plugins/ldap/*.ldif - dohtml doc/*.html - - # lib-specific man pages are provided by the corresponding packages - rm "${D}/usr/share/man/man3/libdlm.3" - - newinitd "${FILESDIR}/${PN}.initd-3.1.5-r1" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" -} diff --git a/sys-cluster/cman/cman-3.1.5.ebuild b/sys-cluster/cman/cman-3.1.5.ebuild deleted file mode 100644 index f97954b26b3..00000000000 --- a/sys-cluster/cman/cman-3.1.5.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit linux-info multilib toolchain-funcs versionator - -CLUSTER_RELEASE="${PV}" -MY_P="cluster-${CLUSTER_RELEASE}" - -MAJ_PV="$(get_major_version)" -MIN_PV="$(get_version_component_range 2-3)" - -DESCRIPTION="Cluster Manager" -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"; -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="dbus ldap" - -RDEPEND="dev-libs/libxml2 - dev-libs/libxslt - dbus? ( sys-apps/dbus ) - ldap? ( net-nds/openldap ) - sys-cluster/corosync - sys-cluster/openais - ~sys-cluster/libccs-${PV} - ~sys-cluster/libfence-${PV} - ~sys-cluster/libcman-${PV} - ~sys-cluster/libdlm-${PV} - ~sys-cluster/liblogthread-${PV} - !sys-cluster/dlm -" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.24" - -S="${WORKDIR}/${MY_P}" - -# TODO: -# * Gentoo'ise the init script - -src_configure() { - # cluster libs have their own separate packages - sed -i -e 's|lib||' "${S}/cman/Makefile" || die - sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die - sed -i -e 's|libs||' "${S}/config/Makefile" || die - sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die - sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die - sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die - - sed -i \ - -e 's|\(^all:.*\)depends |\1|' \ - config/tools/ccs_tool/Makefile \ - fence/fence{d,_node,_tool}/Makefile \ - cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \ - dlm/{tool,tests/usertest}/Makefile \ - || die "sed failed" - - if ! use ldap ; then - sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed" - fi - local myopts="" - use dbus || myopts="--disable_dbus" - ./configure \ - --cc=$(tc-getCC) \ - --cflags="-Wall" \ - --libdir=/usr/$(get_libdir) \ - --disable_kernel_check \ - --kernel_src=${KERNEL_DIR} \ - --somajor="$MAJ_PV" \ - --sominor="$MIN_PV" \ - --without_rgmanager \ - --without_bindings \ - ${myopts} \ - || die "configure problem" -} - -src_install() { - emake DESTDIR="${D}" install - - # we have to create it in the init.d script anyway - rmdir "${D}"/var/run/{cluster,} - - keepdir /var/{lib,log}/cluster - keepdir /etc/cluster/cman-notify.d - - rm -rf "${D}/usr/share/doc" - dodoc \ - doc/{usage.txt,cman_notify_template.sh} \ - config/plugins/ldap/*.ldif - dohtml doc/*.html - - # lib-specific man pages are provided by the corresponding packages - rm "${D}/usr/share/man/man3/libdlm.3" - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" -} diff --git a/sys-cluster/cman/cman-3.2.0.ebuild b/sys-cluster/cman/cman-3.2.0.ebuild deleted file mode 100644 index 2b59cd78f28..00000000000 --- a/sys-cluster/cman/cman-3.2.0.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit linux-info multilib toolchain-funcs versionator - -CLUSTER_RELEASE="${PV}" -MY_P="cluster-${CLUSTER_RELEASE}" - -MAJ_PV="$(get_major_version)" -MIN_PV="$(get_version_component_range 2-3)" - -DESCRIPTION="Cluster Manager" -HOMEPAGE="https://fedorahosted.org/cluster/wiki/HomePage"; -SRC_URI="https://fedorahosted.org/releases/c/l/cluster/${MY_P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~x86" -IUSE="dbus ldap" - -RDEPEND="dev-libs/libxml2 - dev-libs/libxslt - dbus? ( sys-apps/dbus ) - ldap? ( net-nds/openldap ) - sys-cluster/corosync - sys-cluster/openais - ~sys-cluster/libccs-${PV} - ~sys-cluster/libfence-${PV} - ~sys-cluster/libcman-${PV} - ~sys-cluster/libdlm-${PV} - ~sys-cluster/liblogthread-${PV} - !sys-cluster/dlm -" -DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-2.6.24" - -S="${WORKDIR}/${MY_P}" - -# TODO: -# * Gentoo'ise the init script - -src_configure() { - # cluster libs have their own separate packages - sed -i -e 's|lib||' "${S}/cman/Makefile" || die - sed -i -e 's|liblogthread||' "${S}/common/Makefile" || die - sed -i -e 's|libs||' "${S}/config/Makefile" || die - sed -i -e 's|libdlm libdlmcontrol||' "${S}/dlm/Makefile" || die - sed -i -e 's|libfence libfenced||' "${S}/fence/Makefile" || die - sed -i -e 's|fence/libfenced||' "${S}/Makefile" || die - - sed -i \ - -e 's|\(^all:.*\)depends |\1|' \ - config/tools/ccs_tool/Makefile \ - fence/fence{d,_node,_tool}/Makefile \ - cman/{cman_tool,daemon,tests,qdisk,notifyd}/Makefile \ - dlm/{tool,tests/usertest}/Makefile \ - || die "sed failed" - - if ! use ldap ; then - sed -i -e 's|ldap||' config/plugins/Makefile || die "sed failed" - fi - local myopts="" - use dbus || myopts="--disable_dbus" - ./configure \ - --cc=$(tc-getCC) \ - --cflags="-Wall" \ - --libdir=/usr/$(get_libdir) \ - --disable_kernel_check \ - --kernel_src=${KERNEL_DIR} \ - --somajor="$MAJ_PV" \ - --sominor="$MIN_PV" \ - --without_rgmanager \ - --without_bindings \ - ${myopts} \ - || die "configure problem" -} - -src_install() { - emake DESTDIR="${D}" install - - # we have to create it in the init.d script anyway - rmdir "${D}"/var/run/{cluster,} - - keepdir /var/{lib,log}/cluster - keepdir /etc/cluster/cman-notify.d - - rm -rf "${D}/usr/share/doc" - dodoc \ - doc/{usage.txt,cman_notify_template.sh} \ - config/plugins/ldap/*.ldif - dohtml doc/*.html - - # lib-specific man pages are provided by the corresponding packages - rm "${D}/usr/share/man/man3/libdlm.3" - - newinitd "${FILESDIR}/${PN}.initd-3.1.5-r1" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" -} diff --git a/sys-cluster/cman/files/cman.confd b/sys-cluster/cman/files/cman.confd deleted file mode 100644 index 14b7ea79161..00000000000 --- a/sys-cluster/cman/files/cman.confd +++ /dev/null @@ -1,67 +0,0 @@ -CCSD_OPTS= - -# CMAN_CLUSTER_TIMEOUT -- amount of time to wait for joinging a cluster -# before giving up. If CMAN_CLUSTER_TIMEOUT is positive, then we will -# wait CMAN_CLUSTER_TIMEOUT seconds before giving up and failing when -# a cluster is not joined. If CMAN_CLUSTER_TIMEOUT is zero, then -# wait indefinately for a cluster join. If CMAN_CLUSTER_TIMEOUT is -# negative, do not check to see that the cluster has been joined -CMAN_CLUSTER_TIMEOUT=120 - -# CMAN_QUORUM_TIMEOUT -- amount of time to wait for a quorate cluster on -# startup quorum is needed by many other applications, so we may as -# well wait here. If CMAN_QUORUM_TIMEOUT is less than 1, quorum will -# be ignored. -CMAN_QUORUM_TIMEOUT=300 - -# CMAN_SHUTDOWN_TIMEOUT -- amount of time to wait for cman to become a -# cluster member before calling cman_tool leave during shutdown. -# default is 60 seconds -CMAN_SHUTDOWN_TIMEOUT=60 - -# CMAN_JOIN_OPTIONS -#CMAN_JOIN_OPTS="-c ...." - -# CMAN_LEAVE_OPTIONS -#CMAN_LEAVE_OPTS="" - - -# ex: FENCED_OPTS="-w -t 300" -FENCED_OPTS="" - - -# TODO ? -# CMAN_NOTIFYD_START - control the startup behaviour for cmannotifyd -# the variable can take 3 values: -# yes | will always start cmannotifyd -# no | will never start cmannotifyd -# conditional (default) | will start cmannotifyd only if scriptlets -# are found in @NOTIFYDDIR@ -[ -z "$CMAN_NOTIFYD_START" ] && CMAN_NOTIFYD_START=conditional - -# CMAN_SSHD_START - control sshd startup behaviour -# the variable can take 2 values: -# yes | cman will start sshd as early as possible -# no (default) | cman will not start sshd -[ -z "$CMAN_SSHD_START" ] && CMAN_SSHD_START=no - -# FENCE_JOIN_TIMEOUT -- seconds to wait for fence domain join to -# complete. If the join hasn't completed in this time, fence_tool join -# exits with an error, and this script exits with an error. To wait -# indefinitely set the value to -1. -[ -z "$FENCE_JOIN_TIMEOUT" ] && FENCE_JOIN_TIMEOUT=20 - -# FENCED_MEMBER_DELAY -- amount of time to delay fence_tool join to allow -# all nodes in cluster.conf to become cluster members. In seconds. -[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=45 - -# FENCE_JOIN -- boolean value used to control whether or not this node -# should join the fence domain. If FENCE_JOIN is set to "no", then -# the script will not attempt to the fence domain. If FENCE_JOIN is -# set to "yes", then the script will attempt to join the fence domain. -# If FENCE_JOIN is set to any other value, the default behavior is -# to join the fence domain (equivalent to "yes"). -[ -z "$FENCE_JOIN" ] && FENCE_JOIN="yes" - -# FENCED_OPTS -- allow extra options to be passed to fence daemon. -[ -z "$FENCED_OPTS" ] && FENCED_OPTS="" \ No newline at end of file diff --git a/sys-cluster/cman/files/cman.initd b/sys-cluster/cman/files/cman.initd deleted file mode 100644 index 68c34c14681..00000000000 --- a/sys-cluster/cman/files/cman.initd +++ /dev/null @@ -1,318 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CMAN_TOOL="/usr/sbin/cman_tool" -FENCE_TOOL="/usr/sbin/fence_tool" -GFS_CONTROLD="/usr/sbin/gfs_controld" -DLM_CONTROLD="/usr/sbin/dlm_controld" -GROUPD="/usr/sbin/groupd" -FENCED="/usr/sbin/fenced" -CCSD="/usr/sbin/ccsd" - -[ -z "$CCSD_OPTS" ] && CCSD_OPTS="" -[ -z "$CMAN_CLUSTER_TIMEOUT" ] && CMAN_CLUSTER_TIMEOUT=120 -[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0 -[ -z "$CMAN_SHUTDOWN_TIMEOUT" ] && CMAN_SHUTDOWN_TIMEOUT=60 -[ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300 -[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=300 - -depend() { - use net - after xend - after xendomains - provide cman -} - -load_modules() { - local module modules - modules=$1 - - for module in ${modules}; do - ebegin "Loading ${module} kernel module" - modprobe ${module} > /dev/null - eend $? "Failed to load ${module} kernel module" - done -} - -unload_modules() { - local module modules - modules=$1 - - for module in ${modules}; do - ebegin "Unloading ${module} kernel module" - modprobe -r ${module} > /dev/null - eend $? "Failed to unload ${module} kernel module" - done -} - -check_configfs() { - awk '{ print $2 }' /etc/mtab | grep "/sys/kernel/config" &> /dev/null\ - && awk '{ print $3 }' /etc/mtab | grep "configfs" &> /dev/null - - if [ $? -ne 0 ]; then - ewarn "Please add the following line to /etc/fstab:" - ewarn "none configfs /sys/kernel/config defaults 0 0" - eend 1 "configfs not mounted at /sys/kernel/config" - fi -} - -mount_configfs() -{ - local module=$(awk '$2 == "configfs" { print $2 }' /proc/filesystems) - - if [ -z "${module}" ]; then - load_modules "configfs" - sleep 1s - fi - - # configfs - awk '{ print $2 }' /etc/mtab | grep "/sys/kernel/config" &> /dev/null \ - && awk '{ print $3 }' /etc/mtab | grep "configfs" &> /dev/null - - if [ $? -ne 0 ] - then - ebegin "Mounting ConfigFS" - /bin/mount -t configfs none /sys/kernel/config 2>&1 - eend $? - fi - return 0 -} - -umount_configfs() { - local sig retry - local entry entries - - entries="$(awk '$3 == "configfs" { print $2 }' /proc/mounts | sort -r)" - - for entry in $entries; do - ebegin "Unmounting ConfigFS" - umount $entry &>/dev/null - eend $? - done - - local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules) - - if [ ! -z "${module}" ]; then - unload_modules "configfs" - sleep 1s - fi -} - -umount_gfs_filesystems() { - local sig retry - local remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { print $2 }' /proc/mounts | sort -r)" - - if [ -n "${remaining}" ] - then - sig= - retry=3 - while [ -n "${remaining}" -a "${retry}" -gt 0 ] - do - if [ "${retry}" -lt 3 ] - then - ebegin "Unmounting GFS filesystems (retry)" - umount ${remaining} &>/dev/null - eend $? "Failed to unmount GFS filesystems this retry" - else - ebegin "Unmounting GFS filesystems" - umount ${remaining} &>/dev/null - eend $? "Failed to unmount GFS filesystems" - fi - remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" - [ -z "${remaining}" ] && break - /bin/fuser -k -m ${sig} ${remaining} &>/dev/null - sleep 5 - retry=$((${retry} -1)) - sig=-9 - done - fi -} - -unload_allmodules() { - local modules - - modules=$(awk '$1 == "lock_gulm" || \ - $1 == "lock_dlm" || $1 == "dlm" || \ - $1 == "lock_harness" || $1 == "gfs2" || \ - $1 == "gfs" { print $1 }' /proc/modules) - - #modules=$(awk '$1 == "lock_harness" || \ - # $1 == "gfs" { print $1 }' /proc/modules) - - unload_modules "${modules}" -} - -start_ccsd() { - ebegin "Starting ccsd" - start-stop-daemon --start --quiet --exec ${CCSD} -- ${CCSD_OPTS} - eend $? -} - -stop_ccsd() { - ebegin "Stopping ccsd" - start-stop-daemon --stop --quiet -s 9 --exec ${CCSD} - eend $? -} - -start_cman() { - ${CMAN_TOOL} status &> /dev/null - if [ $? -ne 0 ] - then - ebegin "Starting cman" - ${CMAN_TOOL} -t ${CMAN_CLUSTER_TIMEOUT} \ - -w join ${CMAN_JOIN_OPTS} &> /dev/null - - if [ "$?" -ne 0 ] - then - eend 1 "Failed to start cman" - else - eend 0 - - # make sure that we are quorate? - if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ] - then - ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)" - ${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait - eend $? - fi - fi - else - einfo "cman already running" - fi -} - -stop_cman() { - ebegin "Stopping cman" - local stat=0 - ${CMAN_TOOL} status > /dev/null 2>&1 - if [ $? -eq 0 ]; then - retry=3 - stat=1 - while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ] - do - #sleep 2 - #${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \ - # leave remove ${CMAN_LEAVE_OPTS} > /dev/null - ${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \ - remove &> /dev/null - stat=$? - retry=$((${retry} -1)) - done - fi - eend ${stat} -} - -start_groupd() { - ebegin "Starting groupd" - start-stop-daemon --start --exec ${GROUPD} --name groupd - eend $? -} - -stop_groupd() { - ebegin "Stopping groupd" - start-stop-daemon --stop --exec ${GROUPD} --name groupd - eend $? -} - -start_fenced() { - ebegin "Starting fenced" - start-stop-daemon --start --exec ${FENCED} --name fenced - eend $? - - ${CMAN_TOOL} status | grep Flags | grep 2node &> /dev/null - local errmsg=$? - - ebegin "Joining fence domain" - if [ "${errmsg}" -ne 0 ] - then - ${FENCE_TOOL} join -t $FENCED_START_TIMEOUT &> /dev/null - [ $? -eq 0 ] && errmsg=$? || errmsg=1 - else - ${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY &> /dev/null - [ $? -eq 0 ] && errmsg=$? || errmsg=1 - fi - eend $errmsg -} - -stop_fenced() { - # fenced services -# local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')" -# if [ -n "${fence_status}" ]; then -# if [ -x ${FENCE_TOOL} ]; then -# ebegin "Leaving fence domain" -# ${FENCE_TOOL} leave > /dev/null 2>&1 -# eend $? -# fi -# fi - - if [ -x ${FENCE_TOOL} ]; then - if ${FENCE_TOOL} ls >/dev/null 2>&1; then - ebegin "Leaving fence domain" - ${FENCE_TOOL} leave > /dev/null 2>&1 - eend $? - fi - fi - - ebegin "Stopping fenced" - start-stop-daemon --stop --exec ${FENCED} --name fenced - eend $? -} - -start_gfs_controld() { - ebegin "Starting gfs_controld" - start-stop-daemon --start --exec ${GFS_CONTROLD} --name gfs_controld - eend $? -} - -stop_gfs_controld() { - ebegin "Stopping gfs_controld" - start-stop-daemon --stop --exec ${GFS_CONTROLD} --name gfs_controld - eend $? -} - -start_dlm_controld() { - ebegin "Starting dlm_controld" - start-stop-daemon --start --exec ${DLM_CONTROLD} --name dlm_controld - eend $? -} - -stop_dlm_controld() { - ebegin "Stopping dlm_controld" - start-stop-daemon --stop --exec ${DLM_CONTROLD} --name dlm_controld - eend $? -} - -start() { - load_modules "dlm" - - mkdir -p /var/run/cluster - - mount_configfs -# start_ccsd - start_cman - start_fenced - start_groupd - start_dlm_controld -# start_gfs_controld -} - -stop() { - -# umount GFS filesystems -# umount_gfs_filesystems - - stop_dlm_controld - stop_groupd - stop_fenced - stop_cman - - #stop_gfs_controld - #stop_dlm_controld - #stop_groupd - - unload_modules "dlm" -# stop_ccsd -# unload_allmodules - umount_configfs -} diff --git a/sys-cluster/cman/files/cman.initd-3.1.5-r1 b/sys-cluster/cman/files/cman.initd-3.1.5-r1 deleted file mode 100644 index 04cf5f2e7f9..00000000000 --- a/sys-cluster/cman/files/cman.initd-3.1.5-r1 +++ /dev/null @@ -1,349 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CMAN_TOOL="/usr/sbin/cman_tool" -FENCE_TOOL="/usr/sbin/fence_tool" -GFS_CONTROLD="/usr/sbin/gfs_controld" -DLM_CONTROLD="/usr/sbin/dlm_controld" -GROUPD="/usr/sbin/groupd" -FENCED="/usr/sbin/fenced" -CCSD="/usr/sbin/ccsd" - -[ -z "$CCSD_OPTS" ] && CCSD_OPTS="" -[ -z "$CMAN_CLUSTER_TIMEOUT" ] && CMAN_CLUSTER_TIMEOUT=120 -[ -z "$CMAN_QUORUM_TIMEOUT" ] && CMAN_QUORUM_TIMEOUT=0 -[ -z "$CMAN_SHUTDOWN_TIMEOUT" ] && CMAN_SHUTDOWN_TIMEOUT=60 -[ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300 -[ -z "$FENCED_MEMBER_DELAY" ] && FENCED_MEMBER_DELAY=300 - -depend() { - use net - after xend - after xendomains - provide cman -} - -load_modules() { - local module modules - modules=$1 - - rcS=0 # catch the first error here - [ -f /proc/modules ] && for module in ${modules}; do - ebegin "Loading ${module} kernel module" - modprobe -q ${module} - rc=$? # error for this modprobe call - eend $rc "Failed to load ${module} kernel module" - [ $rc -ne 0 ] && rcS=$rc - done - return $rcS -} - -unload_modules() { - local module modules - modules=$1 - - [ -f /proc/modules ] && for module in ${modules}; do - ebegin "Unloading ${module} kernel module" - modprobe -r ${module} > /dev/null - eend $? "Failed to unload ${module} kernel module" - done -} - -check_configfs() { - awk '{ print $2 }' /proc/mounts | grep -sq "/sys/kernel/config" \ - && awk '{ print $3 }' /proc/mounts | grep -sq "configfs" - - if [ $? -ne 0 ]; then - ewarn "Please add the following line to /etc/fstab:" - ewarn "none configfs /sys/kernel/config defaults 0 0" - eend 1 "configfs not mounted at /sys/kernel/config" - fi -} - -mount_configfs() -{ - local module=$(awk '$2 == "configfs" { print $2 }' /proc/filesystems) - - if [ -z "${module}" ]; then - load_modules "configfs" - rc=$? - sleep 1s - [ $rc -ne 0 ] && return 1 - fi - - # configfs - awk '{ print $2 }' /proc/mounts | grep -sq "/sys/kernel/config" \ - && awk '{ print $3 }' /proc/mounts | grep -sq "configfs" - rc=$? - - if [ $rc -ne 0 ] - then - ebegin "Mounting ConfigFS" - /bin/mount -t configfs none /sys/kernel/config 2>&1 - rc=$? - eend $rc - fi - - return $rc -} - -umount_configfs() { - local sig retry - local entry entries - - entries="$(awk '$3 == "configfs" { print $2 }' /proc/mounts | sort -r)" - - for entry in $entries; do - ebegin "Unmounting ConfigFS" - umount $entry >/dev/null 2>&1 - eend $? - done - - local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules) - - if [ ! -z "${module}" ]; then - unload_modules "configfs" - sleep 1s - fi -} - -umount_gfs_filesystems() { - local sig retry - local remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { print $2 }' /proc/mounts | sort -r)" - - if [ -n "${remaining}" ] - then - sig= - retry=3 - while [ -n "${remaining}" -a "${retry}" -gt 0 ] - do - if [ "${retry}" -lt 3 ] - then - ebegin "Unmounting GFS filesystems (retry)" - umount ${remaining} >/dev/null 2>&1 - eend $? "Failed to unmount GFS filesystems this retry" - else - ebegin "Unmounting GFS filesystems" - umount ${remaining} >/dev/null 2>&1 - eend $? "Failed to unmount GFS filesystems" - fi - remaining="$(awk '$3 == "gfs" || $3 == "gfs2" { if ($2 != "/") print $2 }' /proc/mounts | sort -r)" - [ -z "${remaining}" ] && break - /bin/fuser -k -m ${sig} ${remaining} >/dev/null 2>&1 - sleep 5 - retry=$((${retry} -1)) - sig=-9 - done - fi -} - -unload_allmodules() { - local modules - - modules=$(awk '$1 == "lock_gulm" || \ - $1 == "lock_dlm" || $1 == "dlm" || \ - $1 == "lock_harness" || $1 == "gfs2" || \ - $1 == "gfs" { print $1 }' /proc/modules) - - #modules=$(awk '$1 == "lock_harness" || \ - # $1 == "gfs" { print $1 }' /proc/modules) - - unload_modules "${modules}" -} - -start_ccsd() { - ebegin "Starting ccsd" - start-stop-daemon --start --quiet --exec ${CCSD} -- ${CCSD_OPTS} - eend $? -} - -stop_ccsd() { - ebegin "Stopping ccsd" - start-stop-daemon --stop --quiet -s 9 --exec ${CCSD} - eend $? -} - -start_cman() { - ${CMAN_TOOL} status >/dev/null 2>&1 - if [ $? -ne 0 ] - then - ebegin "Starting cman" - ${CMAN_TOOL} -t ${CMAN_CLUSTER_TIMEOUT} \ - -w join ${CMAN_JOIN_OPTS} >/dev/null 2>&1 - - if [ "$?" -ne 0 ] - then - eend 1 "Failed to start cman" - return 1 - else - eend 0 - - # make sure that we are quorate? - if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ] - then - ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)" - ${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait - rc=$? - eend $rc - return $rc - fi - fi - else - einfo "cman already running" - fi -} - -stop_cman() { - ebegin "Stopping cman" - local stat=0 - ${CMAN_TOOL} status > /dev/null 2>&1 - if [ $? -eq 0 ]; then - retry=3 - stat=1 - while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ] - do - #sleep 2 - #${CMAN_TOOL} -w -t ${CMAN_SHUTDOWN_TIMEOUT} \ - # leave remove ${CMAN_LEAVE_OPTS} > /dev/null - ${CMAN_TOOL} leave -t ${CMAN_SHUTDOWN_TIMEOUT} ${CMAN_LEAVE_OPTS} \ - remove >/dev/null 2>&1 - stat=$? - retry=$((${retry} -1)) - done - fi - eend ${stat} -} - -start_groupd() { - ebegin "Starting groupd" - start-stop-daemon --start --exec ${GROUPD} --name groupd - eend $? -} - -stop_groupd() { - ebegin "Stopping groupd" - start-stop-daemon --stop --exec ${GROUPD} --name groupd - eend $? -} - -start_fenced() { - ebegin "Starting fenced" - start-stop-daemon --start --exec ${FENCED} --name fenced - eend $? - - ${CMAN_TOOL} status | grep Flags | grep 2node >/dev/null 2>&1 - local errmsg=$? - - ebegin "Joining fence domain" - if [ "${errmsg}" -ne 0 ] - then - ${FENCE_TOOL} join -t $FENCED_START_TIMEOUT >/dev/null 2>&1 - [ $? -eq 0 ] && errmsg=$? || errmsg=1 - else - ${FENCE_TOOL} join -m $FENCED_MEMBER_DELAY >/dev/null 2>&1 - [ $? -eq 0 ] && errmsg=$? || errmsg=1 - fi - eend $errmsg -} - -stop_fenced() { - # fenced services -# local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')" -# if [ -n "${fence_status}" ]; then -# if [ -x ${FENCE_TOOL} ]; then -# ebegin "Leaving fence domain" -# ${FENCE_TOOL} leave > /dev/null 2>&1 -# eend $? -# fi -# fi - - if [ -x ${FENCE_TOOL} ]; then - if ${FENCE_TOOL} ls >/dev/null 2>&1; then - ebegin "Leaving fence domain" - ${FENCE_TOOL} leave > /dev/null 2>&1 - eend $? - fi - fi - - ebegin "Stopping fenced" - start-stop-daemon --stop --exec ${FENCED} --name fenced - eend $? -} - -start_gfs_controld() { - ebegin "Starting gfs_controld" - start-stop-daemon --start --exec ${GFS_CONTROLD} --name gfs_controld - eend $? -} - -stop_gfs_controld() { - ebegin "Stopping gfs_controld" - start-stop-daemon --stop --exec ${GFS_CONTROLD} --name gfs_controld - eend $? -} - -start_dlm_controld() { - ebegin "Starting dlm_controld" - start-stop-daemon --start --exec ${DLM_CONTROLD} --name dlm_controld - eend $? -} - -stop_dlm_controld() { - ebegin "Stopping dlm_controld" - start-stop-daemon --stop --exec ${DLM_CONTROLD} --name dlm_controld - eend $? -} - -start() { - if ! mount_configfs ; then - eerror "ConfigFS & DLM are required to use cman" - return 1 - fi - - [ -e /sys/module/dlm ] || [ -e /sys/kernel/dlm ] || load_modules "dlm" - if [ ! -e /sys/kernel/dlm ]; then - eerror "ConfigFS & DLM are required to use cman" - return 1 - fi - mkdir -p /var/run/cluster - -# start_ccsd - if ! start_cman ; then - eerror "Failed to start cman" - return 1 - fi - if ! start_fenced; then - eerror "Failed to start fenced" - return 1 - fi - if ! start_groupd; then - eerror "Failed to start groupd" - return 1 - fi - if ! start_dlm_controld; then - eerror "Failed to start dlm_controld" - return 1 - fi -# start_gfs_controld -} - -stop() { - -# umount GFS filesystems -# umount_gfs_filesystems - - stop_dlm_controld - stop_groupd - stop_fenced - stop_cman - - #stop_gfs_controld - #stop_dlm_controld - #stop_groupd - - unload_modules "dlm" -# stop_ccsd -# unload_allmodules - umount_configfs -} diff --git a/sys-cluster/cman/metadata.xml b/sys-cluster/cman/metadata.xml deleted file mode 100644 index ca6ebb8ce73..00000000000 --- a/sys-cluster/cman/metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>clus...@gentoo.org</email> - <name>Gentoo Cluster Project</name> - </maintainer> - <longdescription>Cluster Manager</longdescription> -</pkgmetadata>
