]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-tcp: Remove redundant restart in ctdb_tcp_tnode_cb()
authorRalph Boehme <slow@samba.org>
Sat, 29 Feb 2020 11:28:20 +0000 (12:28 +0100)
committerKarolin Seeger <kseeger@samba.org>
Tue, 24 Mar 2020 07:26:18 +0000 (07:26 +0000)
The node dead upcall has already restarted the outgoing connection.
There's no need to repeat it.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14295

Signed-off-by: Ralph Boehme <slow@samba.org>
Signed-off-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit ea37ecdcd5960311f54a7a5510b88a654da23daa)

ctdb/tcp/tcp_connect.c

index a3e4a471774d0309009d00e3b5b4f796fa40a6df..6db6c6fb1385be1f5fc26ff9bf2456a1f4f94476 100644 (file)
@@ -62,15 +62,9 @@ void ctdb_tcp_stop_connection(struct ctdb_node *node)
 void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data)
 {
        struct ctdb_node *node = talloc_get_type(private_data, struct ctdb_node);
-       struct ctdb_tcp_node *tnode = talloc_get_type(
-               node->transport_data, struct ctdb_tcp_node);
 
        node->ctdb->upcalls->node_dead(node);
 
-       ctdb_tcp_stop_connection(node);
-       tnode->connect_te = tevent_add_timer(node->ctdb->ev, tnode,
-                                            timeval_current_ofs(3, 0),
-                                            ctdb_tcp_node_connect, node);
        TALLOC_FREE(data);
 }