Fix: relayd: return from function without unlocking session lock

[lttng-tools.git] / src / bin / lttng-relayd / main.c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 8415e8cef106db18395a2666c79b555b68d418df..3aef0fabc9d84d358349bc77b97bf958a0a48d0d 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1075,6 +1075,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 +1259,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 +2934,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 +2952,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(