Attachment 315053 Details for Bug 460190 – patch for cman init script

[patch] patch for cman init script

fence-join-cman-init.patch (text/plain), 1.92 KB, created by David Teigland on 2008-08-26 21:40:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Teigland

Created: 2008-08-26 21:40:56 UTC

Size: 1.92 KB

patch

obsolete

>commit 8a36bde17cba28fe9bffdd07716b75af3881a073
>Author: David Teigland <teigland@redhat.com>
>Date:   Tue Aug 26 16:28:20 2008 -0500
>
>    init.d/cman: use fence_tool -m for two node clusters
>    
>    bz 460190
>    
>    Use the new fence_tool -m option in the cman init script.  Again, this
>    is primarily a problem with two_node clusters (because waiting for quorum
>    usually masks the partitioning problems otherwise).  So, we want the
>    init script to check if the cluster is two_node, and use -m if it is.
>    It initially appears that we'll want a default -m value of about 45 seconds.
>    Again, if the nodes converge normally during startup, this delay will be
>    skipped.
>    
>    Signed-off-by: David Teigland <teigland@redhat.com>
>
>diff --git a/cman/init.d/cman b/cman/init.d/cman
>index 9a28a11..bc61c7f 100755
>--- a/cman/init.d/cman
>+++ b/cman/init.d/cman
>@@ -38,6 +38,10 @@
> #     wait indefinately for fenced to start.
> [ -z "$FENCED_START_TIMEOUT" ] && FENCED_START_TIMEOUT=300
> 
>+# 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
>@@ -156,8 +160,15 @@ start_daemons()
> 
> start_fence()
> {
>-    errmsg=$( /sbin/fence_tool -w -t $FENCED_START_TIMEOUT join \
>-	     > /dev/null 2>&1 ) || return 1
>+    /usr/sbin/cman_tool status | grep Flags | grep 2node &> /dev/null
>+    if [ $? -ne 0 ]
>+    then
>+        errmsg=$( /sbin/fence_tool -w -t $FENCED_START_TIMEOUT join \
>+                 > /dev/null 2>&1 ) || return 1
>+    else
>+        errmsg=$( /sbin/fence_tool -w -m $FENCED_MEMBER_DELAY join \
>+                 > /dev/null 2>&1 ) || return 1
>+    fi
>     return 0
> }
>

Actions: View | Diff

Attachments on bug 460190: 315052 | 315053