X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=482ca3e758a334052676fb5e823ed3dc5c6bc56a;hp=43d7891a21aeefc4079fd89b953836f4f425b837;hb=f94b19e6627365cafd172b6e0067c700ae7971c2;hpb=25b50f8fb2a2e9bdd1866dd22c1b2d72929d293f

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 43d7891a2..482ca3e75 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -729,7 +729,7 @@ static void try_close_stream(struct relay_session *session,
 	pthread_mutex_unlock(&session->viewer_ready_lock);
 
 	ret = stream_close(session, stream);
-	if (!ret) {
+	if (ret || session->snapshot) {
 		/* Already close thus the ctf trace is being or has been destroyed. */
 		goto end;
 	}
@@ -1849,7 +1849,7 @@ int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr,
 	cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
 			node.node) {
 		if (stream->session_id == session_id &&
-				!stream->data_pending_check_done) {
+				!stream->data_pending_check_done && !stream->terminated_flag) {
 			is_data_inflight = 1;
 			DBG("Data is still in flight for stream %" PRIu64,
 					stream->stream_handle);