Attachment 12834 Details for Bug 12512 – Patches for v4-5

[patch] Patches for v4-5

BZ12512-v4-5.patch (text/plain), 4.01 KB, created by Amitay Isaacs on 2017-01-17 05:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-01-17 05:10:07 UTC

Size: 4.01 KB

patch

obsolete

>From 23e16ee629856399e2a55dd069d4056dc900907a Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>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 <slow@samba.org>
>Signed-off-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(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 51abc44..e41596d 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
>@@ -240,7 +240,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 f0e4609..c6a87c9 100755
>--- a/ctdb/config/events.d/13.per_ip_routing
>+++ b/ctdb/config/events.d/13.per_ip_routing
>@@ -398,7 +398,7 @@ takeip)
> 	# flush our route cache
> 	set_proc sys/net/ipv4/route/flush 1
> 
>-	$CTDB gratiousarp "$ip" "$iface"
>+	$CTDB gratarp "$ip" "$iface"
> 	;;
> 
> updateip)
>@@ -416,7 +416,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 d295213..71af0a5 100644
>--- a/ctdb/doc/ctdb.1.xml
>+++ b/ctdb/doc/ctdb.1.xml
>@@ -1353,9 +1353,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 a1cba70..28868d1 100755
>--- a/ctdb/tests/eventscripts/stubs/ctdb
>+++ b/ctdb/tests/eventscripts/stubs/ctdb
>@@ -445,7 +445,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
>

Flags:

martins: review+

Actions: View

Attachments on bug 12512: 12834 | 12835