X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;fp=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=dbf69a0e6537f119992ca004ec34e8e25bd3b36f;hp=73dfec2c842ec45e320b7f37a8b9f4e23939f4c2;hb=8cd15f6adb2b119ef9ea231363d74818e14ecffc;hpb=7c2f789a14457b69b934ccea5deb8d2404cae1ee

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index 73dfec2c8..dbf69a0e6 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -2794,6 +2794,8 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	msg->creation_timestamp = be64toh(msg->creation_timestamp);
 	msg->override_name_length = be32toh(msg->override_name_length);
 
+	pthread_mutex_lock(&conn->session->lock);
+	session->ongoing_rotation = true;
 	if (session->current_trace_chunk &&
 			!lttng_trace_chunk_get_name_overridden(session->current_trace_chunk)) {
 		chunk_status = lttng_trace_chunk_rename_path(session->current_trace_chunk,
@@ -2805,7 +2807,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 			goto end;
 		}
 	}
-	session->ongoing_rotation = true;
 	if (!session->current_trace_chunk) {
 		if (!session->has_rotated) {
 			new_path = "";
@@ -2899,7 +2900,6 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		goto end;
 	}
 
-	pthread_mutex_lock(&conn->session->lock);
 	if (conn->session->pending_closure_trace_chunk) {
 		/*
 		 * Invalid; this means a second create_trace_chunk command was
@@ -2908,7 +2908,7 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		ERR("Invalid trace chunk close command received; a trace chunk is already waiting for a trace chunk close command");
 		reply_code = LTTNG_ERR_INVALID_PROTOCOL;
 		ret = -1;
-		goto end_unlock_session;
+		goto end;
 	}
 	conn->session->pending_closure_trace_chunk =
 			conn->session->current_trace_chunk;
@@ -2917,9 +2917,8 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	if (!conn->session->pending_closure_trace_chunk) {
 		session->ongoing_rotation = false;
 	}
-end_unlock_session:
-	pthread_mutex_unlock(&conn->session->lock);
 end:
+	pthread_mutex_unlock(&conn->session->lock);
 	reply.ret_code = htobe32((uint32_t) reply_code);
 	send_ret = conn->sock->ops->sendmsg(conn->sock,
 			&reply,