fixed a double close of a socket, leading to an EPOLL error

diff --git a/tcp/ctdb_tcp.h b/tcp/ctdb_tcp.h
index 3a1285f47c2febd7d0cd283bd2893e6a859a1f67..7d47cbcfe149f6e3f48ceb6ef1a153bb871fc3ac 100644 (file)
--- a/tcp/ctdb_tcp.h
+++ b/tcp/ctdb_tcp.h
@@ -50,5 +50,6 @@ void ctdb_tcp_node_connect(struct event_context *ev, struct timed_event *te,
                           struct timeval t, void *private_data);
 void ctdb_tcp_read_cb(uint8_t *data, size_t cnt, void *args);
 void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data);
+void ctdb_tcp_stop_connection(struct ctdb_node *node);
 
 #define CTDB_TCP_ALIGNMENT 8

diff --git a/tcp/tcp_connect.c b/tcp/tcp_connect.c
index ad9ce954ffeb60e350a6aeed3d326d1738718760..3548f82ed705b66ebe6c2be22dd1251e439013c9 100644 (file)
--- a/tcp/tcp_connect.c
+++ b/tcp/tcp_connect.c
@@ -25,6 +25,26 @@
 #include "../include/ctdb_private.h"
 #include "ctdb_tcp.h"
 
+/*
+  stop any connecting (established or pending) to a node
+ */
+void ctdb_tcp_stop_connection(struct ctdb_node *node)
+{
+       struct ctdb_tcp_node *tnode = talloc_get_type(
+               node->private_data, struct ctdb_tcp_node);
+       
+       ctdb_queue_set_fd(tnode->out_queue, -1);
+       talloc_free(tnode->connect_te);
+       talloc_free(tnode->connect_fde);
+       tnode->connect_fde = NULL;
+       tnode->connect_te = NULL;
+       if (tnode->fd != -1) {
+               close(tnode->fd);
+               tnode->fd = -1;
+       }
+}
+
+
 /*
   called when a complete packet has come in - should not happen on this socket
  */
@@ -38,12 +58,9 @@ void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data)
                node->ctdb->upcalls->node_dead(node);
        }
 
-       /* start a new connect cycle to try to re-establish the
-          link */
-       ctdb_queue_set_fd(tnode->out_queue, -1);
-       tnode->fd = -1;
-       event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
-                       ctdb_tcp_node_connect, node);
+       ctdb_tcp_stop_connection(node);
+       tnode->connect_te = event_add_timed(node->ctdb->ev, tnode, timeval_zero(),
+                                           ctdb_tcp_node_connect, node);
 }
 
 /*
@@ -66,23 +83,24 @@ static void ctdb_node_connect_write(struct event_context *ev, struct fd_event *f
 
        if (getsockopt(tnode->fd, SOL_SOCKET, SO_ERROR, &error, &len) != 0 ||
            error != 0) {
-               talloc_free(tnode->connect_fde);
-               tnode->connect_fde = NULL;
-               close(tnode->fd);
-               tnode->fd = -1;
-               event_add_timed(ctdb->ev, tnode, timeval_current_ofs(1, 0), 
-                               ctdb_tcp_node_connect, node);
+               ctdb_tcp_stop_connection(node);
+               tnode->connect_te = event_add_timed(ctdb->ev, tnode, 
+                                                   timeval_current_ofs(1, 0),
+                                                   ctdb_tcp_node_connect, node);
                return;
        }
 
        talloc_free(tnode->connect_fde);
        tnode->connect_fde = NULL;
-       
+
         setsockopt(tnode->fd,IPPROTO_TCP,TCP_NODELAY,(char *)&one,sizeof(one));
         setsockopt(tnode->fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&one,sizeof(one));
 
        ctdb_queue_set_fd(tnode->out_queue, tnode->fd);
 
+       /* the queue subsystem now owns this fd */
+       tnode->fd = -1;
+       
        /* tell the ctdb layer we are connected */
        node->ctdb->upcalls->node_connected(node);
 }
@@ -117,12 +135,7 @@ void ctdb_tcp_node_connect(struct event_context *ev, struct timed_event *te,
         struct sockaddr_in sock_in;
         struct sockaddr_in sock_out;
 
-       if (tnode->fd != -1) {
-               talloc_free(tnode->connect_fde);
-               tnode->connect_fde = NULL;
-               close(tnode->fd);
-               tnode->fd = -1;
-       }
+       ctdb_tcp_stop_connection(node);
 
        tnode->fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -159,11 +172,10 @@ void ctdb_tcp_node_connect(struct event_context *ev, struct timed_event *te,
 
        if (connect(tnode->fd, (struct sockaddr *)&sock_out, sizeof(sock_out)) != 0 &&
            errno != EINPROGRESS) {
-               /* try again once a second */
-               close(tnode->fd);
-               tnode->fd = -1;
-               event_add_timed(ctdb->ev, tnode, timeval_current_ofs(1, 0), 
-                               ctdb_tcp_node_connect, node);
+               ctdb_tcp_stop_connection(node);
+               tnode->connect_te = event_add_timed(ctdb->ev, tnode, 
+                                                   timeval_current_ofs(1, 0),
+                                                   ctdb_tcp_node_connect, node);
                return;
        }
 

diff --git a/tcp/tcp_init.c b/tcp/tcp_init.c
index 1b186c3f400ac2536e2aa370a4e885383be2ef17..a47a18d2989e6b5d7ed5e386630619db1717f615 100644 (file)
--- a/tcp/tcp_init.c
+++ b/tcp/tcp_init.c
@@ -80,8 +80,9 @@ static int ctdb_tcp_start(struct ctdb_context *ctdb)
                struct ctdb_tcp_node *tnode = talloc_get_type(
                        node->private_data, struct ctdb_tcp_node);
                if (!ctdb_same_address(&ctdb->address, &node->address)) {
-                       event_add_timed(ctdb->ev, tnode, timeval_zero(), 
-                                       ctdb_tcp_node_connect, node);
+                       tnode->connect_te = event_add_timed(ctdb->ev, tnode, 
+                                                           timeval_zero(), 
+                                                           ctdb_tcp_node_connect, node);
                }
        }
 
@@ -99,11 +100,10 @@ static void ctdb_tcp_restart(struct ctdb_node *node)
 
        DEBUG(0,("Tearing down connection to dead node :%d\n", node->pnn));
 
-       tnode->fd = -1;
-       ctdb_queue_set_fd(tnode->out_queue, -1);
+       ctdb_tcp_stop_connection(node);
 
-       event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
-                       ctdb_tcp_node_connect, node);
+       tnode->connect_te = event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
+                                           ctdb_tcp_node_connect, node);
 }