From db8bd39bf5878dfb9e584d05ba6543e62b003d59 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 16 Jan 2017 13:38:50 +1100 Subject: [PATCH] ctdb-scripts: Fix remaining uses of "ctdb gratiousarp" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit 5e00a6b346325f52e35b9785eaffd72239aebcf5) --- ctdb/config/events.d/10.interface | 4 ++-- ctdb/config/events.d/13.per_ip_routing | 4 ++-- ctdb/config/events.d/91.lvs | 2 +- ctdb/doc/ctdb.1.xml | 4 ++-- ctdb/tests/eventscripts/stubs/ctdb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface index 073bc85..97227e8 100755 --- 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 c4b2535..a7a23c0 100755 --- 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 052b509..9725ee8 100755 --- 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 1d6979a..f24f8dd 100644 --- 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 - gratiousarp <parameter>IPADDR</parameter> <parameter>INTERFACE</parameter> + gratarp <parameter>IPADDR</parameter> <parameter>INTERFACE</parameter> - 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. diff --git a/ctdb/tests/eventscripts/stubs/ctdb b/ctdb/tests/eventscripts/stubs/ctdb index 10a4859..c304dde 100755 --- 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 "$@";; -- 2.9.3