diff options
| author | Volker Lendecke <vl@samba.org> | 2019-11-07 15:26:01 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-11-20 14:58:32 +0000 |
| commit | 92b73cf0bf028321b99eba942b76d494c6a96e2b (patch) | |
| tree | 44271f59b34fc552e43ffae2c9035538b069552b | |
| parent | 0dcb2efb8f828606d22742100491fb7b8f61a340 (diff) | |
| download | samba-92b73cf0bf028321b99eba942b76d494c6a96e2b.tar.gz | |
ctdb-tcp: Close inflight connecting TCP sockets after fork
Commit c68b6f96f26 changed the talloc hierarchy such that outgoing TCP sockets
while sitting in the async connect() syscall are not freed via
ctdb_tcp_shutdown() anymore, they are hanging off a longer-running structure.
Free this structure as well.
If an outgoing TCP socket leaks into a long-running child process (possibly the
recovery daemon), this connection will never be closed as seen by the
destination node. Because with recent changes incoming connections will not be
accepted as long as any incoming connection is alive, with that socket leak
into the recovery daemon we will never again be able to successfully connect to
the node that is affected by this leak. Further attempts to connect will be
discarded by the destination as long as the recovery daemon keeps this socket
alive.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14175
RN: Avoid communication breakdown on node reconnect
Signed-off-by: Martin Schwenke <martin@meltin.net>
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit a6d99d9e5c5bc58e6d56be7a6c1dbc7c8d1a882f)
Autobuild-User(v4-9-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-9-test): Wed Nov 20 14:58:33 UTC 2019 on sn-devel-144
| -rw-r--r-- | ctdb/tcp/tcp_init.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c index 20ad260929b..dc92abd4e6c 100644 --- a/ctdb/tcp/tcp_init.c +++ b/ctdb/tcp/tcp_init.c @@ -137,8 +137,14 @@ static void ctdb_tcp_shutdown(struct ctdb_context *ctdb) { struct ctdb_tcp *ctcp = talloc_get_type(ctdb->private_data, struct ctdb_tcp); + uint32_t i; + talloc_free(ctcp); ctdb->private_data = NULL; + + for (i=0; i<ctdb->num_nodes; i++) { + TALLOC_FREE(ctdb->nodes[i]->private_data); + } } /* |