make the ctdb tool use the killtcp control in the daemon instead of

calling killtcp directly

(This used to be ctdb commit d21e3e9cf11bdcba6234302e033d6549c557dd69)

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index b72faa83d7e07a9fcf97ed3527b1749309f848e0..fcf6e7bf56bb69690567630a661924ac6fb8d999 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -2094,6 +2094,32 @@ int ctdb_ctrl_get_all_tunables(struct ctdb_context *ctdb,
 }
 
 
+/*
+  kill a tcp connection
+ */
+int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
+                     struct timeval timeout, 
+                     uint32_t destnode,
+                     struct ctdb_control_killtcp *killtcp)
+{
+       TDB_DATA data;
+       int32_t res;
+       int ret;
+
+       data.dsize = sizeof(struct ctdb_control_killtcp);
+       data.dptr  = (unsigned char *)killtcp;
+
+       ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_KILL_TCP, 0, data, NULL,
+                          NULL, &res, &timeout, NULL);
+       if (ret != 0 || res != 0) {
+               DEBUG(0,(__location__ " ctdb_control for killtcp failed\n"));
+               return -1;
+       }
+
+       return 0;
+}
+
+
 /*
   initialise the ctdb daemon for client applications
 

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 4c7b0da4ae0588968084f29238a8fdd52f74790b..a95f8aa9109e0eb8251a722199d994f75e507cec 100644 (file)
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -446,7 +446,7 @@ struct ctdb_control_tcp {
 /*
   struct for kill_tcp control
  */
-struct ctdb_control_kill_tcp {
+struct ctdb_control_killtcp {
        struct sockaddr_in src;
        struct sockaddr_in dst;
 };
@@ -1068,4 +1068,10 @@ int ctdb_sys_open_capture_socket(void);
 int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *src, struct sockaddr_in *dst);
 int ctdb_sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp);
 
+int ctdb_ctrl_killtcp(struct ctdb_context *ctdb, 
+                     struct timeval timeout, 
+                     uint32_t destnode,
+                     struct ctdb_control_killtcp *killtcp);
+
+
 #endif

diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c
index 604715cfd63976c8bdcd19b81c400136fa8bd747..6d170156572a31e181da55468002648a99e3bbc8 100644 (file)
--- a/ctdb/server/ctdb_control.c
+++ b/ctdb/server/ctdb_control.c
@@ -287,7 +287,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
                return ctdb_control_modflags(ctdb, indata);
 
        case CTDB_CONTROL_KILL_TCP: 
-               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_kill_tcp));
+               CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_killtcp));
                return ctdb_control_kill_tcp(ctdb, indata);
 
        default:

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index a86ba60cee43166ce0969892f60264da7294de40..0aad2851a54d8b4731818d66de41c7f87c8d9b27 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -687,7 +687,7 @@ int32_t ctdb_control_tcp_add(struct ctdb_context *ctdb, TDB_DATA indata)
  */
 int32_t ctdb_control_kill_tcp(struct ctdb_context *ctdb, TDB_DATA indata)
 {
-       struct ctdb_control_kill_tcp *killtcp = (struct ctdb_control_kill_tcp *)indata.dptr;
+       struct ctdb_control_killtcp *killtcp = (struct ctdb_control_killtcp *)indata.dptr;
 
        ctdb_killtcp_add_connection(ctdb, &killtcp->src, &killtcp->dst);
 

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 2308261d00535eb0079063ed30bf2a1ac7ee5587..9f5f743823dcae0cfcab7ea9d293652f95b5063c 100644 (file)
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -307,32 +307,27 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
  */
 static int kill_tcp(struct ctdb_context *ctdb, int argc, const char **argv)
 {
-       int i, ret, numrst;
-       struct sockaddr_in src, dst;
+       int ret;
+       struct ctdb_control_killtcp killtcp;
 
-       if (argc < 3) {
+       if (argc < 2) {
                usage();
        }
 
-       if (!parse_ip_port(argv[0], &src)) {
+       if (!parse_ip_port(argv[0], &killtcp.src)) {
                printf("Bad IP:port '%s'\n", argv[0]);
                return -1;
        }
 
-       if (!parse_ip_port(argv[1], &dst)) {
+       if (!parse_ip_port(argv[1], &killtcp.dst)) {
                printf("Bad IP:port '%s'\n", argv[1]);
                return -1;
        }
 
-       numrst = strtoul(argv[2], NULL, 0);
-
-       for (i=0;i<numrst;i++) {
-               ret = ctdb_sys_kill_tcp(ctdb->ev, &src, &dst);
-
-               printf("ret:%d\n", ret);
-               if (ret==0) {
-                       return 0;
-               }
+       ret = ctdb_ctrl_killtcp(ctdb, TIMELIMIT(), options.vnn, &killtcp);
+       if (ret != 0) {
+               printf("Unable to killtcp from node %u\n", options.vnn);
+               return ret;
        }
 
        return -1;
@@ -890,7 +885,7 @@ static const struct {
        { "recover",         control_recover,           true,  "force recovery" },
        { "freeze",          control_freeze,            true,  "freeze all databases" },
        { "thaw",            control_thaw,              true,  "thaw all databases" },
-       { "killtcp",         kill_tcp,                  false, "kill a tcp connection. Try <num> times.", "<srcip:port> <dstip:port> <num>" },
+       { "killtcp",         kill_tcp,                  false, "kill a tcp connection.", "<srcip:port> <dstip:port>" },
        { "tickle",          tickle_tcp,                false, "send a tcp tickle ack", "<srcip:port> <dstip:port>" },
 };