Merge commit 'rusty/script-report'

[vlendec/samba-autobuild/.git] / ctdb / config / events.d / 10.interface

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 4d070777269bb86b5f73b29ad252c66c92c23f99..f881808f1154257680838091962ef9e14e840e7a 100755 (executable)
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -6,10 +6,7 @@
 # public interface
 
 . $CTDB_BASE/functions
-loadconfig ctdb
-
-cmd="$1"
-shift
+loadconfig
 
 [ -z "$CTDB_PUBLIC_ADDRESSES" ] && {
        CTDB_PUBLIC_ADDRESSES=$CTDB_BASE/public_addresses
@@ -20,7 +17,7 @@ shift
        exit 0
 }
 
-case $cmd in 
+case "$1" in 
      #############################
      # called when ctdbd starts up
      startup)
@@ -44,20 +41,20 @@ case $cmd in
      ################################################
      # called when ctdbd wants to claim an IP address
      takeip)
-       if [ $# != 3 ]; then
+       if [ $# != 4 ]; then
           echo "must supply interface, IP and maskbits"
           exit 1
        fi
-       iface=$1
-       ip=$2
-       maskbits=$3
+       iface=$2
+       ip=$3
+       maskbits=$4
 
        # we make sure the interface is up first
        /sbin/ip link set $iface up || {
                 echo "Failed to bringup interface $iface"
                 exit 1
        }
-       /sbin/ip addr add $ip/$maskbits dev $iface || {
+       /sbin/ip addr add $ip/$maskbits brd + dev $iface || {
                 echo "Failed to add $ip/$maskbits on dev $iface"
        }
        # cope with the script being killed while we have the interface blocked
@@ -71,7 +68,7 @@ case $cmd in
      ##################################################
      # called when ctdbd wants to release an IP address
      releaseip)
-       if [ $# != 3 ]; then
+       if [ $# != 4 ]; then
           echo "must supply interface, IP and maskbits"
           exit 1
        fi
@@ -86,9 +83,9 @@ case $cmd in
        # 2) use netstat -tn to find existing connections, and kill them 
        # 3) remove the IP from the interface
        # 4) remove the firewall rule
-       iface=$1
-       ip=$2
-       maskbits=$3
+       iface=$2
+       ip=$3
+       maskbits=$4
 
        failed=0
        # we do an extra delete to cope with the script being killed
@@ -100,13 +97,13 @@ case $cmd in
        # this _very_ annoying behaviour we have to keep a record of the secondaries and re-add
        # them afterwards. yuck
        secondaries=""
-       if /sbin/ip addr list dev $iface primary | grep "inet $ip/$maskbits " > /dev/null; then
+       if /sbin/ip addr list dev $iface primary | grep -q "inet $ip/$maskbits " ; then
            secondaries=`/sbin/ip addr list dev $iface secondary | grep " inet " | awk '{print $2}'`
        fi
        /sbin/ip addr del $ip/$maskbits dev $iface || failed=1
        [ -z "$secondaries" ] || {
            for i in $secondaries; do
-               if /sbin/ip addr list dev $iface | grep "inet $i" > /dev/null; then
+               if /sbin/ip addr list dev $iface | grep -q "inet $i" ; then
                    echo "kept secondary $i on dev $iface"
                else 
                    echo "re-adding secondary address $i to dev $iface"
@@ -114,7 +111,7 @@ case $cmd in
                fi
            done
        }
-       iptables -D INPUT -i $iface -d $ip -j DROP
+       iptables -D INPUT -i $iface -d $ip -j DROP 2> /dev/null
        [ $failed = 0 ] || {
                 echo "Failed to del $ip on dev $iface"
                 exit 1
@@ -140,36 +137,53 @@ case $cmd in
                sed -e "s/^[^\t ]*[\t ]*//" -e "s/[\t ]*$//"`
 
        [ "$CTDB_PUBLIC_INTERFACE" ] && INTERFACES="$CTDB_PUBLIC_INTERFACE $INTERFACES"
+       [ "$CTDB_NATGW_PUBLIC_IFACE" ] && INTERFACES="$CTDB_NATGW_PUBLIC_IFACE $INTERFACES"
 
        INTERFACES=`for IFACE in $INTERFACES ; do echo $IFACE ; done | sort | uniq`
 
        for IFACE in $INTERFACES ; do
-           case $IFACE in 
-           bond*)
-               IFACE=`echo $IFACE |sed -e 's/\....$//'`
-               grep '^MII Status: up' /proc/net/bonding/$IFACE > /dev/null || {
-                       echo "ERROR: public network interface $IFACE is down"
+           # These interfaces are sometimes bond devices
+           # When we use VLANs for bond interfaces, there will only
+           # be an entry in /proc for the underlying real interface
+           REALIFACE=`echo $IFACE |sed -e 's/\..*$//'`
+           [ -f /proc/net/bonding/$REALIFACE ] && {
+               grep -q 'Currently Active Slave: None' /proc/net/bonding/$REALIFACE && {
+                       echo "ERROR: No active slaves for bond device $REALIFACE"
                        exit 1
                }
-               ;;
+               grep -q '^MII Status: up' /proc/net/bonding/$REALIFACE || {
+                       echo "ERROR: public network interface $REALIFACE is down"
+                       exit 1
+               }
+               exit 0;
+           }
+
+           case $IFACE in 
            ib*)
                # we dont know how to test ib links
                ;;
            *)
                [ -z "$IFACE" ] || {
-                   /usr/sbin/ethtool $IFACE | grep 'Link detected: yes' > /dev/null || {
-                       echo "ERROR: No link on the public network interface $IFACE"
-                       exit 1
+                   /usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
+                       # On some systems, this is not successful when a
+                       # cable is plugged but the interface has not been
+                       # brought up previously. Bring the interface up and
+                       # try again...
+                       /sbin/ip link set $IFACE up
+                       /usr/sbin/ethtool $IFACE | grep -q 'Link detected: yes' || {
+                           echo "ERROR: No link on the public network interface $IFACE"
+                           exit 1
+                       }
                    }
                }
                ;;
            esac
        done
        ;;
-
+    *)
+       ctdb_standard_event_handler "$@"
+       ;;
 esac
 
 exit 0
 
-
-