[Cluster-devel] Cluster Project branch, RHEL5, updated. cmirror_1_1_15-122-g15ae691

[lhh at sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=15ae6919dd7c33b1b6746c12a1170c794e736f52

The branch, RHEL5 has been updated
       via  15ae6919dd7c33b1b6746c12a1170c794e736f52 (commit)
      from  b7a5aea8b738a99c00333837a86dcbf6d3f1f2ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15ae6919dd7c33b1b6746c12a1170c794e736f52
Author: Lon Hohberger <lhh at redhat.com>
Date:   Fri Jun 20 11:07:15 2008 -0400

    [rgmanager] Make rgmanager check pbond links correctly
    
    Rgmanager doesn't check pbond links (bonded links when Xen
    networking is used) correctly.  This patch fixes it.
    
    Red Hat Bugzilla #451654
    
    Patch from John Ruemker.
    
    Signed-off-by: John Ruemker <jruemker at redhat.com>
    Signed-off-by: Lon Hohberger <lhh at redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 rgmanager/src/resources/ip.sh |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
index 138c937..5020e08 100755
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -543,12 +543,21 @@ network_link_up()
 	if [ "${intf_arg/bond/}" != "$intf_arg" ]; then
 		
 		#
+		# With Xen we must check for slaves of pbondX, not bondX
+		#
+		masterif=$intf_arg
+		line=$(ip link list | awk {'print $2'} | grep "p$intf_arg:")
+		if [ $? -eq 0 ] ; then
+			masterif="p$intf_arg"
+		fi
+		
+		#
 		# Bonded driver.  Check link of all slaves for this interface.
 		# If any link is up, the bonding driver is expected to route
 		# traffic through that link.  Thus, the entire bonded link
 		# is declared up.
 		#
-		slaves=$(findSlaves $intf_arg)
+		slaves=$(findSlaves $masterif)
 		if [ $? -ne 0 ]; then
 			ocf_log err "Error finding slaves of $intf_arg"
 			return 1


hooks/post-receive
--
Cluster Project