X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=cbd9e9cc70bc8733e7f82dc59d21b29651524ae2;hb=d546eeec57f3d23255e55d6d7384ab825bae8218;hp=8415e8cef106db18395a2666c79b555b68d418df;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 8415e8cef..cbd9e9cc7 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -918,6 +918,10 @@ static int create_named_thread_poll_set(struct lttng_poll_event *events,
 
 	ret = fd_tracker_util_poll_create(the_fd_tracker,
 		        name, events, 1, LTTNG_CLOEXEC);
+	if (ret) {
+		PERROR("Failed to create \"%s\" poll file descriptor", name);
+		goto error;
+	}
 
 	/* Add quit pipe */
 	ret = lttng_poll_add(events, thread_quit_pipe[0], LPOLLIN | LPOLLERR);
@@ -1075,6 +1079,7 @@ static void *relay_thread_listener(void *data)
 
 	DBG("[thread] Relay listener started");
 
+	rcu_register_thread();
 	health_register(health_relayd, HEALTH_RELAYD_TYPE_LISTENER);
 
 	health_code_update();
@@ -1258,6 +1263,7 @@ error_sock_control:
 		ERR("Health error occurred in %s", __func__);
 	}
 	health_unregister(health_relayd);
+	rcu_unregister_thread();
 	DBG("Relay listener thread cleanup complete");
 	lttng_relay_stop_threads();
 	return NULL;
@@ -2932,7 +2938,7 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 				new_path);
 		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ret = -1;
-			goto end;
+			goto end_unlock_session;
 		}
 		session->ongoing_rotation = false;
 	}
@@ -2950,7 +2956,7 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		chunk_status = lttng_trace_chunk_rename_path(chunk, old_path);
 		if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 			ret = -1;
-			goto end;
+			goto end_unlock_session;
 		}
 	}
 	chunk_status = lttng_trace_chunk_set_close_timestamp(