cluster: STABLE3 - cman init: propagate errors from fence_tool operations

Fabio M. Di Nitto fabbione at fedoraproject.org
Mon Jan 18 21:35:18 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8c2975e0abe6881b36f4d7114a83ebcfd701afde
Commit:        8c2975e0abe6881b36f4d7114a83ebcfd701afde
Parent:        3305a7b3c18ced65795954311449dda080959c09
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Mon Jan 18 22:32:58 2010 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Mon Jan 18 22:32:58 2010 +0100

cman init: propagate errors from fence_tool operations

Resolves: rhbz#556603

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 cman/init.d/cman.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index a35590a..e0281be 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -683,18 +683,18 @@ join_fence_domain()
 	if ! cman_tool status | grep Flags | grep 2node \
 		> /dev/null 2>&1; then
 		errmsg=$( fence_tool join -w $FENCE_JOIN_TIMEOUT \
-			> /dev/null 2>&1 ) || return 1
+			2>&1 ) || return 1
 	else
 		errmsg=$( fence_tool join -w $FENCE_JOIN_TIMEOUT \
 			-m $FENCED_MEMBER_DELAY join \
-			> /dev/null 2>&1 ) || return 1
+			2>&1 ) || return 1
 	fi
 }
 
 leave_fence_domain()
 {
 	if status fenced > /dev/null 2>&1; then
-		fence_tool leave -w 10 > /dev/null 2>&1
+		errmsg=$( fence_tool leave -w 10 2>&1 )
 		return $?
 	fi
 }


More information about the cluster-commits mailing list