Non-maintainer revbump with init.d sanity checks for configfs/dlm per stabilization bug #442512; also convert init.d to be POSIX-sh safe. Please note that configfs and DLM are required for cman.

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 446 insertions, 3 deletions

diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog
index 815c92912630..f3a61d7b2d09 100644
--- a/sys-cluster/cman/ChangeLog
+++ b/sys-cluster/cman/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/cman
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.48 2011/10/18 20:54:50 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.49 2012/12/11 22:16:13 robbat2 Exp $
+
+*cman-3.1.5-r1 (11 Dec 2012)
+
+  11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> +cman-3.1.5-r1.ebuild,
+  +files/cman.initd-3.1.5-r1:
+  Non-maintainer revbump with init.d sanity checks for configfs/dlm per
+  stabilization bug #442512; also convert init.d to be POSIX-sh safe. Please
+  note that configfs and DLM are required for cman.
 
   18 Oct 2011; Jeroen Roovers <jer@gentoo.org> cman-3.1.5.ebuild:
   Marked ~hppa (bug #386951).
@@ -10,4 +18,3 @@
   14 Sep 2011; Ultrabug <ultrabug@gentoo.org> +cman-3.1.5.ebuild,
   +files/cman.confd, +files/cman.initd, +files/qdiskd.initd, +metadata.xml:
   Initial import
-
diff --git a/sys-cluster/cman/cman-3.1.5-r1.ebuild b/sys-cluster/cman/cman-3.1.5-r1.ebuild
new file mode 100644
index 000000000000..dd9afe58e51a
--- /dev/null
+++ b/sys-cluster/cman/cman-3.1.5-r1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-3.1.5-r1.ebuild,v 1.1 2012/12/11 22:16:13 robbat2 Exp $
+
+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.initd-3.1.5-r1 b/sys-cluster/cman/files/cman.initd-3.1.5-r1
new file mode 100644
index 000000000000..91fee3427eab
--- /dev/null
+++ b/sys-cluster/cman/files/cman.initd-3.1.5-r1
@@ -0,0 +1,335 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman.initd-3.1.5-r1,v 1.1 2012/12/11 22:16:13 robbat2 Exp $
+
+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"
+	        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 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
+	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
+}