X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=f00f07db1b8e63fc280c5a868379da2a47a68ade;hp=3ca1797ed9b07b12468840f0bcd963709f72a92b;hb=3d7708ff51bfae7a01b7062d1f2567b2854ec374;hpb=dbd6665b396de85a4d6b311c8942f82ea9813891

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 3ca1797ed..f00f07db1 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -309,6 +309,7 @@ static int make_viewer_streams(struct relay_session *session,
 	rcu_read_lock();
 	cds_lfht_for_each_entry(session->ctf_traces_ht->ht, &iter.iter, ctf_trace,
 			node.node) {
+		bool trace_has_metadata_stream = false;
 		struct relay_stream *stream;
 
 		health_code_update();
@@ -317,6 +318,30 @@ static int make_viewer_streams(struct relay_session *session,
 			continue;
 		}
 
+		/*
+		 * Iterate over all the streams of the trace to see if we have a
+		 * metadata stream.
+		 */
+		cds_list_for_each_entry_rcu(
+				stream, &ctf_trace->stream_list, stream_node)
+		{
+			if (stream->is_metadata) {
+				trace_has_metadata_stream = true;
+				break;
+			}
+		}
+
+		/*
+		 * If there is no metadata stream in this trace at the moment
+		 * and we never sent one to the viewer, skip the trace. We
+		 * accept that the viewer will not see this trace at all.
+		 */
+		if (!trace_has_metadata_stream &&
+				!ctf_trace->metadata_stream_sent_to_viewer) {
+			ctf_trace_put(ctf_trace);
+			continue;
+		}
+
 		cds_list_for_each_entry_rcu(stream, &ctf_trace->stream_list, stream_node) {
 			struct relay_viewer_stream *vstream;
 
@@ -331,6 +356,15 @@ static int make_viewer_streams(struct relay_session *session,
 			}
 			vstream = viewer_stream_get_by_id(stream->stream_handle);
 			if (!vstream) {
+				/*
+				 * Save that we sent the metadata stream to the
+				 * viewer. So that we know what trace the viewer
+				 * is aware of.
+				 */
+				if (stream->is_metadata) {
+					ctf_trace->metadata_stream_sent_to_viewer =
+							true;
+				}
 				vstream = viewer_stream_create(stream,
 						viewer_trace_chunk, seek_t);
 				if (!vstream) {