Cluster Project branch, master, updated. cluster-2.99.04-52-g837e923

Cluster Project branch, master, updated. cluster-2.99.04-52-g837e923

[lhh]

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=837e9238be257221fffe7abe1efccbe1332ce810

The branch, master has been updated
       via  837e9238be257221fffe7abe1efccbe1332ce810 (commit)
      from  9e513104970a78be352cfeea7d557378618b283b (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 837e9238be257221fffe7abe1efccbe1332ce810
Author: Lon Hohberger <lhh@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.
    
    Patch from John Ruemker.
    
    Signed-off-by: John Ruemker <jruemker@redhat.com>
    Signed-off-by: Lon Hohberger <lhh@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 1f0e144..3cdba1a 100644
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -523,12 +523,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