X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=dbf69a0e6537f119992ca004ec34e8e25bd3b36f;hb=17acb03ff782169d659eaa65e0e70402222e8b34;hp=adbf3f3b4c18be0693770903599934588c0c37e5;hpb=ce9dbd47eea9fe023691518ef46b58c03b89c236;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index adbf3f3b4..dbf69a0e6 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -1758,24 +1758,6 @@ static int relay_close_stream(const struct lttcomm_relayd_hdr *recv_hdr,
 	 *        request.
 	 */
 	try_stream_close(stream);
-	if (stream->is_metadata) {
-		struct relay_viewer_stream *vstream;
-
-		vstream = viewer_stream_get_by_id(stream->stream_handle);
-		if (vstream) {
-			if (stream->no_new_metadata_notified) {
-				/*
-				 * Since all the metadata has been sent to the
-				 * viewer and that we have a request to close
-				 * its stream, we can safely teardown the
-				 * corresponding metadata viewer stream.
-				 */
-				viewer_stream_put(vstream);
-			}
-			/* Put local reference. */
-			viewer_stream_put(vstream);
-		}
-	}
 	stream_put(stream);
 	ret = 0;
 
@@ -2812,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,
@@ -2823,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 = "";
@@ -2917,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
@@ -2926,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;
@@ -2935,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,