X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=e769daf88fe99b6c0e01d2006861ea8c6a804957;hp=fe52702c77489209dcb43208206bb6e7dd1fb04c;hb=bda7c7b9b4c633de16f3d8bf109f9d21fdd9a5fb;hpb=77f7bd852edcc4f7227792553229c59fd590a447

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index fe52702c7..e769daf88 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1275,8 +1275,15 @@ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr,
 	stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num);
 	pthread_mutex_unlock(&stream->lock);
 
-	stream_close(stream);
-
+	/*
+	 * This is one of the conditions which may trigger a stream close
+	 * with the others being:
+	 *     1) A close command is received for a stream
+	 *     2) The control connection owning the stream is closed
+	 *     3) We have received all of the stream's data _after_ a close
+	 *        request.
+	 */
+	try_stream_close(stream);
 	if (stream->is_metadata) {
 		struct relay_viewer_stream *vstream;
 
@@ -2156,7 +2163,7 @@ static int relay_process_data(struct relay_connection *conn)
 	uint64_t net_seq_num;
 	uint32_t data_size;
 	struct relay_session *session;
-	bool new_stream = false;
+	bool new_stream = false, close_requested = false;
 
 	ret = conn->sock->ops->recvmsg(conn->sock, &data_hdr,
 			sizeof(struct lttcomm_relayd_data_hdr), 0);
@@ -2275,7 +2282,12 @@ static int relay_process_data(struct relay_connection *conn)
 	stream->prev_seq = net_seq_num;
 
 end_stream_unlock:
+	close_requested = stream->close_requested;
 	pthread_mutex_unlock(&stream->lock);
+	if (close_requested) {
+		try_stream_close(stream);
+	}
+
 	if (new_stream) {
 		pthread_mutex_lock(&session->lock);
 		uatomic_set(&session->new_streams, 1);