Attachment 12335 Details for Bug 12123 – Patch for 4.5rc

[patch] Patch for 4.5rc

BZ12123.patch (text/plain), 3.38 KB, created by Martin Schwenke on 2016-08-09 03:24:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2016-08-09 03:24:12 UTC

Size: 3.38 KB

patch

obsolete

>From 426958e854dad20323d2e3e51a9de513508662d3 Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>Date: Thu, 4 Aug 2016 15:16:09 +1000
>Subject: [PATCH 1/2] ctdb-tools: "ctdb tickle" command should run without
> daemon
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12123
>
>Signed-off-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit f2b319e457eb43410997615f834f0a21fa5e5b0a)
>---
> ctdb/tools/ctdb.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
>index d0381a5..c036bec 100644
>--- a/ctdb/tools/ctdb.c
>+++ b/ctdb/tools/ctdb.c
>@@ -6231,7 +6231,7 @@ static const struct ctdb_cmd {
> 		"check if local node is the recmaster", NULL },
> 	{ "gratarp", control_gratarp, false, true,
> 		"send a gratuitous arp", "<ip> <interface>" },
>-	{ "tickle", control_tickle, false, false,
>+	{ "tickle", control_tickle, true, false,
> 		"send a tcp tickle ack", "<srcip:port> <dstip:port>" },
> 	{ "gettickles", control_gettickles, false, true,
> 		"get the list of tickles", "<ip> [<port>]" },
>-- 
>2.8.1
>
>
>From de5a4735d4443034293851243f4fb564a8fe42b3 Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>Date: Tue, 24 Mar 2015 21:04:25 +1100
>Subject: [PATCH 2/2] ctdb-doc: Document that "ctdb tickle" can now read from
> stdin
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12123
>
>Although this has been queued for a while, with changes to add stdin
>support to the original ctdb tool, this came for free with the
>replacement tool.
>
>addtickle and deltickle also now have this feature.  However, they're
>internal commands and we're not adding new documentation for
>internal/debug commands.
>
>Signed-off-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit 2295f5009dabfc09eec40bb4f30679d76310ce12)
>---
> ctdb/doc/ctdb.1.xml | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
>diff --git a/ctdb/doc/ctdb.1.xml b/ctdb/doc/ctdb.1.xml
>index 7878c4c..9324813 100644
>--- a/ctdb/doc/ctdb.1.xml
>+++ b/ctdb/doc/ctdb.1.xml
>@@ -1440,13 +1440,24 @@ RUNNING
>     </refsect2>
> 
>     <refsect2>
>-      <title>tickle <parameter>SRC-IPADDR</parameter>:<parameter>SRC-PORT</parameter> <parameter>DST-IPADDR</parameter>:<parameter>DST-PORT</parameter></title>
>+      <title>tickle</title>
>       <para>
>-	Send a TCP tickle to the source host for the specified TCP
>-	connection.  A TCP tickle is a TCP ACK packet with an invalid
>-	sequence and acknowledge number and will when received by the
>-	source host result in it sending an immediate correct ACK back
>-	to the other end.
>+	Read a list of TCP connections, one per line, from standard
>+	input and send a TCP tickle to the source host for each
>+	connection.  A connection is specified as:
>+      </para>
>+      <synopsis>
>+	<parameter>SRC-IPADDR</parameter>:<parameter>SRC-PORT</parameter> <parameter>DST-IPADDR</parameter>:<parameter>DST-PORT</parameter>
>+      </synopsis>
>+      <para>
>+	A single connection can be specified on the command-line
>+	rather than on standard input.
>+      </para>
>+      <para>
>+	A TCP tickle is a TCP ACK packet with an invalid sequence and
>+	acknowledge number and will when received by the source host
>+	result in it sending an immediate correct ACK back to the
>+	other end.
>       </para>
>       <para>
> 	TCP tickles are useful to "tickle" clients after a IP failover has
>-- 
>2.8.1
>

Flags:

amitay: review+

Actions: View

Attachments on bug 12123: 12335