From bca20426b69bf5ee1ec9cae9eb3f7825e702260c Mon Sep 17 00:00:00 2001 From: Christian Zoffoli Date: Fri, 21 Nov 2008 22:27:54 +0000 Subject: Fixed homepage, ebuild cleanup, new cman init, fixed path in qdiskd, added patch for RH bug #457107. Package-Manager: portage-2.1.4.4 --- sys-cluster/cman/ChangeLog | 8 +- sys-cluster/cman/Manifest | 19 +++- sys-cluster/cman/cman-2.03.09.ebuild | 11 +- .../cman/files/cman-2.02.39-bug457107.patch | 12 +++ sys-cluster/cman/files/cman-2.0x.rc | 111 +++++++++++++-------- sys-cluster/cman/files/qdiskd-2.0x.rc | 4 +- 6 files changed, 107 insertions(+), 58 deletions(-) create mode 100644 sys-cluster/cman/files/cman-2.02.39-bug457107.patch (limited to 'sys-cluster/cman') diff --git a/sys-cluster/cman/ChangeLog b/sys-cluster/cman/ChangeLog index 9eed9e4ea0a3..a98fc9e81ec8 100644 --- a/sys-cluster/cman/ChangeLog +++ b/sys-cluster/cman/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/cman # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.41 2008/11/13 18:56:17 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/ChangeLog,v 1.42 2008/11/21 22:27:54 xmerlin Exp $ + + 21 Nov 2008; Christian Zoffoli files/cman-2.0x.rc, + files/qdiskd-2.0x.rc, +files/cman-2.02.39-bug457107.patch, + cman-2.03.09.ebuild: + Fixed homepage, ebuild cleanup, new cman init, fixed path in qdiskd, added + patch for RH bug #457107. *cman-2.03.09 (13 Nov 2008) diff --git a/sys-cluster/cman/Manifest b/sys-cluster/cman/Manifest index 86f1c267630f..c5aa715c2b7f 100644 --- a/sys-cluster/cman/Manifest +++ b/sys-cluster/cman/Manifest @@ -1,7 +1,18 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX cman-2.02.39-bug457107.patch 718 RMD160 7d20034211ea0a8cb5500876b57aed76a8396768 SHA1 ff0666752ede6706411efdbcf337a13cd87ea098 SHA256 44b825e2a8be1d9363b6906008dea197adf18e86b11dc9e316143fad0e744e35 AUX cman-2.0x.conf 1068 RMD160 94ee01b8380a69f76bc281ffed64060a16c65f23 SHA1 adb51284a2d943697f8dd15eff8415197c84ef49 SHA256 474c5a2f2d4613c52292d42ccd3a1b3baec7e5cab3dc73dc1e1adfb8225db473 -AUX cman-2.0x.rc 7466 RMD160 e723febcd6cc310e494739d975db49f4d26030fb SHA1 1e5e0a7a22d013873d84949031840506a4b9a580 SHA256 bf4003ac386b5414ec6fba898cefbe3bdf399b967410dca96b34b5764e08b997 -AUX qdiskd-2.0x.rc 591 RMD160 7927c3b9525c71d30405ac4e93c9dbfbe292e7de SHA1 6532096c55c822b7f38647662fbd88794ac104e3 SHA256 32daa85d2914216f1cf273d8c5dee5396c074910db26ab7781a1646768c5469f +AUX cman-2.0x.rc 7849 RMD160 1fbe269d2deecd63bb18b66232872736cba0db61 SHA1 9ae9c9cd9436650c4b9352fedd7cd4b218aeee25 SHA256 29b8cacd53a8de44081120d4130798357f72301af819db245b058d1e0377c42a +AUX qdiskd-2.0x.rc 595 RMD160 3f083e4efea60616604a7a81406f719c48c03260 SHA1 da5ee9731f4d0902395eecd1920136e1cf5456c5 SHA256 1ca52a4dc6bd7475d3c7d3511e83629b2fb92b287577bf11fe7f608a21f30e6d DIST cluster-2.03.09.tar.gz 1784357 RMD160 9ac5c3fd0fece8ec17bd31d116c43b33612741d0 SHA1 c2cdbc657da2a9efde4b1e6d2657170e1c09b5b8 SHA256 b6d6f35f58b2f8628c369391e0fd01b1803af40029ec1e6ef88865dda38b855f -EBUILD cman-2.03.09.ebuild 2619 RMD160 8d62d5e771eebaa7cc62570a214ee3576500ff51 SHA1 7fca8d378305247d9ba858f71e42cf757f9093a8 SHA256 9f6059908b566591b36046541d81e2e93af3e1c3760f54df2da2853f25960c60 -MISC ChangeLog 5816 RMD160 3706fe9be4ee177dd6f76f5172639664b9c05a66 SHA1 32f70477764c01f04d13701ca805e45edb5a3ab3 SHA256 b0898a06cb7130cf3c23155aafb1bf7ec604ef78696bd91e9f0142cc5ad61bf7 +EBUILD cman-2.03.09.ebuild 2473 RMD160 68a23ce4102ae68a4386ee9f8b09c8e84a8906bf SHA1 6b073a694207f6f9182536c865c1c3a59800a874 SHA256 5149726c063982704c70f996a691790fdcaaff4f6f35fbdf198b9d7a75f67e89 +MISC ChangeLog 6080 RMD160 5400afb964367cdfdc2ffbfee2bcea21634e7987 SHA1 c053478f87611b227528543eed19e2ef8de15b21 SHA256 834e48e8c1e858ed95373ca9e9bd7a4e4ffad297843c5b86fb3069f4d9b32455 MISC metadata.xml 229 RMD160 4dcf17b88c5f4db2e817f473f3e8269b0bff2e6e SHA1 e6315be43241c55bdc0d12a42fa05632c5ff9b79 SHA256 49e13d2d49bef7298e3bb665ebeceeff9b0880fae5ff639cb8405993504f244f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkknRBQACgkQgMUyd/cdjWsFOQCfYtHvCjk3JCxajYyGF+fjNVmJ +1+oAn3Hattc6t9cVWOAMywpnTEElEtDM +=G3/7 +-----END PGP SIGNATURE----- diff --git a/sys-cluster/cman/cman-2.03.09.ebuild b/sys-cluster/cman/cman-2.03.09.ebuild index 4cca0cfa7565..bca62b3383b7 100644 --- a/sys-cluster/cman/cman-2.03.09.ebuild +++ b/sys-cluster/cman/cman-2.03.09.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.1 2008/11/13 18:56:17 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/cman-2.03.09.ebuild,v 1.2 2008/11/21 22:27:54 xmerlin Exp $ inherit eutils versionator @@ -11,7 +11,7 @@ MAJ_PV="$(get_major_version)" MIN_PV="$(get_version_component_range 2).$(get_version_component_range 3)" DESCRIPTION="general-purpose symmetric cluster manager" -HOMEPAGE="http://sources.redhat.com/cluster/" +HOMEPAGE="http://sources.redhat.com/cluster/wiki/" SRC_URI="ftp://sources.redhat.com/pub/cluster/releases/${MY_P}.tar.gz" LICENSE="GPL-2" @@ -41,6 +41,8 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}"/cman-2.02.39-bug457107.patch || die + # fix the manual pages have executable bit sed -i -e ' /\tinstall -d/s/install/& -m 0755/; t @@ -91,9 +93,4 @@ pkg_postinst() { einfo "" einfo "Please add a cluster.conf in /etc/cluster/" einfo "" - einfo "If you want to use cman and dlm 2.xx.xx" - einfo "with 2.6.20 kernels you have to patch your" - einfo "kernel sources with:" - einfo "http://dev.gentoo.org/~xmerlin/gfs/dlm-gfs-2.6.20.patch.bz2" - einfo "" } diff --git a/sys-cluster/cman/files/cman-2.02.39-bug457107.patch b/sys-cluster/cman/files/cman-2.02.39-bug457107.patch new file mode 100644 index 000000000000..40a4159a16a3 --- /dev/null +++ b/sys-cluster/cman/files/cman-2.02.39-bug457107.patch @@ -0,0 +1,12 @@ +--- cluster-2.03.09/cman/daemon/commands.c.orig 2008-11-18 14:59:52.000000000 +0100 ++++ cluster-2.03.09/cman/daemon/commands.c 2008-11-18 15:00:27.000000000 +0100 +@@ -1729,8 +1729,7 @@ + + /* Newer nodes 6.1.0 onwards, set the DIRTY flag if they have state. If the new node has been down + and has state then we mark it disallowed because we cannot merge stateful nodes */ +- if ( (msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) || +- (msg->flags & NODE_FLAGS_DIRTY && msg->first_trans && !node->us)) { ++ if ( msg->flags & NODE_FLAGS_DIRTY && (node->flags & NODE_FLAGS_BEENDOWN)) { + /* Don't duplicate messages */ + if (node->state != NODESTATE_AISONLY) { + if (cluster_is_quorate) { diff --git a/sys-cluster/cman/files/cman-2.0x.rc b/sys-cluster/cman/files/cman-2.0x.rc index 2980850e511d..3cda35c4546c 100755 --- a/sys-cluster/cman/files/cman-2.0x.rc +++ b/sys-cluster/cman/files/cman-2.0x.rc @@ -1,15 +1,22 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman-2.0x.rc,v 1.2 2008/03/22 22:59:25 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/cman-2.0x.rc,v 1.3 2008/11/21 22:27:54 xmerlin Exp $ -CCSD_BIN="/usr/sbin/ccsd" +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 @@ -84,12 +91,12 @@ umount_configfs() { eend $? done - local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules) + local module=$(awk '$1 == "configfs" { print $1 }' /proc/modules) - if [ ! -z "${module}" ]; then - unload_modules "configfs" - sleep 1s - fi + if [ ! -z "${module}" ]; then + unload_modules "configfs" + sleep 1s + fi } umount_gfs_filesystems() { @@ -130,31 +137,34 @@ unload_allmodules() { $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_BIN} -- ${CCSD_OPTS} + --exec ${CCSD} -- ${CCSD_OPTS} eend $? } stop_ccsd() { ebegin "Stopping ccsd" start-stop-daemon --stop --quiet \ - -s 9 --exec ${CCSD_BIN} + -s 9 --exec ${CCSD} eend $? } start_cman() { - /usr/sbin/cman_tool status &> /dev/null + ${CMAN_TOOL} status &> /dev/null if [ $? -ne 0 ] then ebegin "Starting cman" - /usr/sbin/cman_tool -t ${CMAN_CLUSTER_TIMEOUT} \ - -w join ${CMAN_JOIN_OPTS} > /dev/null + ${CMAN_TOOL} -t ${CMAN_CLUSTER_TIMEOUT} \ + -w join ${CMAN_JOIN_OPTS} &> /dev/null if [ "$?" -ne 0 ] then @@ -166,7 +176,7 @@ start_cman() { if [ ${CMAN_QUORUM_TIMEOUT} -gt 0 ] then ebegin "Waiting for quorum (${CMAN_QUORUM_TIMEOUT} secs)" - /usr/sbin/cman_tool -t ${CMAN_QUORUM_TIMEOUT} -q wait + ${CMAN_TOOL} -t ${CMAN_QUORUM_TIMEOUT} -q wait eend $? fi fi @@ -176,16 +186,19 @@ start_cman() { } stop_cman() { - ebegin "Stopping cman" - local stat=0 - /usr/sbin/cman_tool status > /dev/null 2>&1 - if [ $? -eq 0 ]; then - retry=3 - stat=1 - while [ "${stat}" -eq 1 -a "${retry}" -gt 0 ] - do - /usr/sbin/cman_tool -w -t ${CMAN_SHUTDOWN_TIMEOUT} \ - leave ${CMAN_LEAVE_OPTS} > /dev/null + 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} -w -t 60 \ + leave remove ${CMAN_LEAVE_OPTS} &> /dev/null stat=$? retry=$((${retry} -1)) @@ -197,63 +210,73 @@ stop_cman() { start_groupd() { ebegin "Starting groupd" - start-stop-daemon --start --exec /usr/sbin/groupd --name groupd + start-stop-daemon --start --exec ${GROUPD} --name groupd eend $? } stop_groupd() { ebegin "Stopping groupd" - start-stop-daemon --stop --exec /usr/sbin/groupd --name groupd + start-stop-daemon --stop --exec ${GROUPD} --name groupd eend $? } start_fenced() { - ebegin "Starting fenced" - start-stop-daemon --start --exec /usr/sbin/fenced --name fenced - eend $? + ebegin "Starting fenced" + start-stop-daemon --start --exec ${FENCED} --name fenced + eend $? - ebegin "Joining fence domain" - /usr/sbin/fence_tool join ${FENCED_OPTS}> /dev/null 2>&1 - eend $? + ${CMAN_TOOL} status | grep Flags | grep 2node &> /dev/null + local errmsg=$? + + ebegin "Joining fence domain" + if [ "${errmsg}" -ne 0 ] + then + ${FENCE_TOOL} -w -t $FENCED_START_TIMEOUT join &> /dev/null + [ $? -eq 0 ] && errmsg=$? || errmsg=1 + else + ${FENCE_TOOL} -w -m $FENCED_MEMBER_DELAY join &> /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 }')" + local fence_status="$( ${CMAN_TOOL} services | awk '$1 ~ /fence/ { print $3 }')" if [ -n "${fence_status}" ]; then - if [ -x /usr/sbin/fence_tool ]; then + if [ -x ${FENCE_TOOL} ]; then ebegin "Leaving fence domain" - /usr/sbin/fence_tool leave > /dev/null 2>&1 + ${FENCE_TOOL} leave > /dev/null 2>&1 eend $? fi fi - ebegin "Stopping fenced" - start-stop-daemon --stop --exec /usr/sbin/fenced --name fenced - eend $? + #ebegin "Stopping fenced" + #start-stop-daemon --stop --exec ${FENCED} --name fenced + #eend $? } start_gfs_controld() { ebegin "Starting gfs_controld" - start-stop-daemon --start --exec /usr/sbin/gfs_controld --name 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 /usr/sbin/gfs_controld --name 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 /usr/sbin/dlm_controld --name 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 /usr/sbin/dlm_controld --name dlm_controld + start-stop-daemon --stop --exec ${DLM_CONTROLD} --name dlm_controld eend $? } @@ -276,9 +299,9 @@ stop() { stop_fenced stop_cman - stop_gfs_controld - stop_dlm_controld - stop_groupd + #stop_gfs_controld + #stop_dlm_controld + #stop_groupd stop_ccsd unload_allmodules diff --git a/sys-cluster/cman/files/qdiskd-2.0x.rc b/sys-cluster/cman/files/qdiskd-2.0x.rc index 4045862b75fb..add364549d20 100755 --- a/sys-cluster/cman/files/qdiskd-2.0x.rc +++ b/sys-cluster/cman/files/qdiskd-2.0x.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/qdiskd-2.0x.rc,v 1.1 2008/03/17 16:47:11 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman/files/qdiskd-2.0x.rc,v 1.2 2008/11/21 22:27:54 xmerlin Exp $ depend() { use net @@ -10,7 +10,7 @@ depend() { start() { ebegin "Starting the Quorum Disk Daemon" - start-stop-daemon --start --quiet --exec /sbin/qdiskd -- -Q + start-stop-daemon --start --quiet --exec /usr/sbin/qdiskd -- -Q eend $? "Failed to start qdiskd" } -- cgit v1.2.3-65-gdbad