From: Martin Schwenke <martin@meltin.net>
Date: Wed, 23 Mar 2016 00:03:41 +0000 (+1100)
Subject: ctdb-killtcp: Store retry interval in killtcp structure
X-Git-Tag: tdb-1.3.9~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e66cdd8312416208dbe532577e5b95ff362a9671;p=thirdparty%2Fsamba.git

ctdb-killtcp: Store retry interval in killtcp structure

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tools/ctdb_killtcp.c b/ctdb/tools/ctdb_killtcp.c
index b1898d73eda..123c3603100 100644
--- a/ctdb/tools/ctdb_killtcp.c
+++ b/ctdb/tools/ctdb_killtcp.c
@@ -43,6 +43,7 @@ struct ctdb_kill_tcp {
 	void *destructor_data;
 	unsigned int attempts;
 	unsigned int max_attempts;
+	struct timeval retry_interval;
 };
 
 static const char *prog;
@@ -207,7 +208,9 @@ static void ctdb_tickle_sentenced_connections(struct tevent_context *ev,
 	/* try tickling them again in a seconds time
 	 */
 	tevent_add_timer(ev, killtcp,
-			 tevent_timeval_current_ofs(1, 0),
+			 tevent_timeval_current_ofs(
+				 killtcp->retry_interval.tv_sec,
+				 killtcp->retry_interval.tv_usec),
 			 ctdb_tickle_sentenced_connections, killtcp);
 }
 
@@ -258,6 +261,9 @@ static int ctdb_killtcp(struct tevent_context *ev,
 		killtcp->attempts = 0;
 		killtcp->max_attempts = 5;
 
+		killtcp->retry_interval.tv_sec = 1;
+		killtcp->retry_interval.tv_usec = 0;
+
 		*killtcp_arg = killtcp;
 	}