ctdb-scripts: Fix remaining uses of "ctdb gratiousarp"

This changed to "ctdb gratarp" some time ago but the scripts were
never updated.

Fix the documentation for the ctdb tool too.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12512

Reported-by: Ralph Böhme <slow@samba.org>
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface
index 073bc851408289be38292dec94eb6bd9fa75cce0..97227e8178beb24d7163009ae8dc135e05f8c002 100755 (executable)
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -215,7 +215,7 @@ updateip)
        # 2) remove the IP from the old interface (and new interface, to be sure)
        # 3) add the IP to the new interface
        # 4) remove the firewall rule
-       # 5) use ctdb gratiousarp to propagate the new mac address
+       # 5) use ctdb gratarp to propagate the new mac address
        # 6) use netstat -tn to find existing connections, and tickle them
        _oiface=$2
        niface=$3
@@ -247,7 +247,7 @@ updateip)
        flush_route_cache
 
        # propagate the new mac address
-       $CTDB gratiousarp "$ip" "$niface"
+       $CTDB gratarp "$ip" "$niface"
 
        # tickle all existing connections, so that dropped packets
        # are retransmited and the tcp streams work

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index c4b25354561ba74513df238e7e0b82e51f2a1ac6..a7a23c02483b4759923d13ef1cc6dbe9910085ba 100755 (executable)
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -396,7 +396,7 @@ takeip)
        # flush our route cache
        set_proc sys/net/ipv4/route/flush 1
 
-       $CTDB gratiousarp "$ip" "$iface"
+       $CTDB gratarp "$ip" "$iface"
        ;;
 
 updateip)
@@ -414,7 +414,7 @@ updateip)
        # flush our route cache
        set_proc sys/net/ipv4/route/flush 1
 
-       $CTDB gratiousarp "$ip" "$niface"
+       $CTDB gratarp "$ip" "$niface"
        tickle_tcp_connections "$ip"
        ;;
 

diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs
index 052b5091e5b0242d5fe2d467b1f83adfdf365e85..9725ee88508cbdfc1b22ebfd30b9ce9117dd2b30 100755 (executable)
--- a/ctdb/config/events.d/91.lvs
+++ b/ctdb/config/events.d/91.lvs
@@ -110,7 +110,7 @@ ipreallocated)
        ipvsadm -a -t "$CTDB_LVS_PUBLIC_IP" -r 127.0.0.1
        ipvsadm -a -u "$CTDB_LVS_PUBLIC_IP" -r 127.0.0.1
 
-       $CTDB gratiousarp \
+       $CTDB gratarp \
             "$CTDB_LVS_PUBLIC_IP" "$CTDB_LVS_PUBLIC_IFACE" >/dev/null 2>&1
 
        flush_route_cache

diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
index 1d6979a4890a244903c6767cdeba04fb28e4b9b4..f24f8dd4966f22ecab7ea5450064dd34faf5da4a 100644 (file)
--- a/ctdb/doc/ctdb.1.xml
+++ b/ctdb/doc/ctdb.1.xml
@@ -1479,9 +1479,9 @@ dbid:0xb775fff6 name:secrets.tdb path:/usr/local/var/lib/ctdb/persistent/secrets
     </refsect2>
 
     <refsect2>
-      <title>gratiousarp <parameter>IPADDR</parameter> <parameter>INTERFACE</parameter></title>
+      <title>gratarp <parameter>IPADDR</parameter> <parameter>INTERFACE</parameter></title>
       <para>
-       Send out a gratious ARP for the specified interface through
+       Send out a gratuitous ARP for the specified interface through
        the specified interface. This command is mainly used by the
        ctdb eventscripts.
       </para>

diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb
index 10a48590a3519ff16ba0296bd1a238f485eae042..c304dde1c405ef64ad2cfc8c2a57945ec41839b8 100755 (executable)
--- a/ctdb/tests/eventscripts/stubs/ctdb
+++ b/ctdb/tests/eventscripts/stubs/ctdb
@@ -481,7 +481,7 @@ case "$1" in
            echo "|${2:-monitor}|${_b}|${_code}|${_status}|${_d1}|${_d2}|${_err_out}|"
        done
        ;;
-    gratiousarp) : ;;  # Do nothing for now
+    gratarp) : ;;  # Do nothing for now
     ip)            ctdb_ip "$@" ;;
     pnn|xpnn)      ctdb_pnn ;;
     enable)        ctdb_enable "$@";;