Attachment 297229 Details for Bug 436381 – Allow start-if-enabled before fenced in cman script

[patch] Allow start-if-enabled before fenced in cman script

patch-436381.patch (text/plain), 1.60 KB, created by Lon Hohberger on 2008-03-07 17:58:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-03-07 17:58:08 UTC

Size: 1.60 KB

patch

obsolete

>diff --git a/cman/init.d/cman b/cman/init.d/cman
>index be26226..e138798 100755
>--- a/cman/init.d/cman
>+++ b/cman/init.d/cman
>@@ -97,6 +97,35 @@ start_cman()
>     return 0
> }
> 
>+
>+start_qdiskd()
>+{
>+    declare current_runlevel
>+
>+    current_runlevel=$(/sbin/runlevel 2>/dev/null | awk '{ print $2 }' 2>/dev/null)
>+    #
>+    # Start qdiskd before fenced to resolve bug #436381.  This only
>+    # happens if qdiskd is configured to run in the runlevel we are in
>+    #
>+    /sbin/chkconfig --levels "$current_runlevel" qdiskd 2>/dev/null
>+    if [ $? -ne 0 ]; then
>+        # qdiskd doesn't start at this runlevel.
>+        return 0
>+    fi
>+
>+    echo -n "   Starting qdiskd... "
>+    /sbin/service qdiskd start &> /dev/null
>+    if [ $? -eq 0 ] 
>+    then
>+	echo "done"
>+    else
>+	echo "failed"
>+	return 1
>+    fi
>+    return 0
>+}
>+
>+
> start_daemons()
> {
>     status groupd &> /dev/null
>@@ -255,6 +284,9 @@ start()
> 	echo "failed"
> 	return 1
>     fi
>+
>+    start_qdiskd
>+
>     echo -n "   Starting daemons... "
>     start_daemons
>     if [ $? -eq 0 ] 
>diff --git a/cman/init.d/qdiskd b/cman/init.d/qdiskd
>index f1c02aa..0a2c97a 100755
>--- a/cman/init.d/qdiskd
>+++ b/cman/init.d/qdiskd
>@@ -19,9 +19,26 @@ retries=0
> # See how we were called.
> case "$1" in
>   start)
>-	action "Starting the Quorum Disk Daemon:" qdiskd -Q
>+	echo -n "Starting the Quorum Disk Daemon:"
>+
>+	$0 status >/dev/null
>+	if [ $? -eq 0 ]; then
>+		echo_success
>+		echo
>+		exit 0
>+	fi
>+
>+	qdiskd -Q
> 	rtrn=$?
>-	[ $rtrn = 0 ] && touch $LOCK_FILE
>+	if [ $rtrn = 0 ]; then
>+		touch $LOCK_FILE
>+		echo_success
>+		echo
>+	else
>+		echo_failure
>+		echo
>+	fi
>+		
> 	;;
> 
>   stop)

Actions: View | Diff

Attachments on bug 436381: 297104 | 297229