Backport: relayd: track the data listener socket

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index ff135c645ffb158d31a919d5ef882a5023a9fb07..d6a8923e19aa1c56667838fe7710def869c57456 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -940,7 +940,7 @@ static void *relay_thread_listener(void *data)
                goto error_sock_control;
        }
 
-       data_sock = relay_socket_create(data_uri, NULL);
+       data_sock = relay_socket_create(data_uri, "Data listener");
        if (!data_sock) {
                goto error_sock_relay;
        }
@@ -1094,7 +1094,9 @@ error_testpoint:
        (void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
 error_create_poll:
        if (data_sock->fd >= 0) {
-               ret = data_sock->ops->close(data_sock);
+               ret = fd_tracker_close_unsuspendable_fd(the_fd_tracker,
+                               &data_sock->fd, 1, close_sock,
+                               data_sock);
                if (ret) {
                        PERROR("close");
                }