X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=aa0586814e6ba55adeb6c2b35d5c31f1789bcc51;hp=096c855f6d91eda1110a2382b9cfbe81d42f3ca3;hb=c0bae11d346fa301d993430a2cf33b3c426e3140;hpb=2229a09cabb924fb3e8c73d283895510f946a6b2

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 096c855f6..aa0586814 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -313,6 +313,12 @@ int make_viewer_streams(struct relay_session *session,
 			if (!stream->published) {
 				goto next;
 			}
+			/*
+			 * Stream has no data, don't consider it yet.
+			 */
+			if (stream->prev_seq == -1ULL) {
+				goto next;
+			}
 			vstream = viewer_stream_get_by_id(stream->stream_handle);
 			if (!vstream) {
 				vstream = viewer_stream_create(stream, seek_t);
@@ -1478,8 +1484,6 @@ int viewer_get_packet(struct relay_connection *conn)
 	struct lttng_viewer_get_packet get_packet_info;
 	struct lttng_viewer_trace_packet reply;
 	struct relay_viewer_stream *vstream = NULL;
-	struct ctf_trace *ctf_trace;
-	struct relay_viewer_stream *metadata_viewer_stream = NULL;
 
 	DBG2("Relay get data packet");
 
@@ -1501,57 +1505,7 @@ int viewer_get_packet(struct relay_connection *conn)
 		goto send_reply_nolock;
 	}
 
-	ctf_trace = vstream->stream->trace;
-
-	/* metadata_viewer_stream may be NULL. */
-	metadata_viewer_stream =
-			ctf_trace_get_viewer_metadata_stream(ctf_trace);
-
-	if (metadata_viewer_stream) {
-		bool get_packet_err = false;
-
-		pthread_mutex_lock(&metadata_viewer_stream->stream->lock);
-		DBG("get packet metadata check: recv %" PRIu64 " sent %" PRIu64,
-			metadata_viewer_stream->stream->metadata_received,
-			metadata_viewer_stream->metadata_sent);
-		if (!metadata_viewer_stream->stream->metadata_received ||
-				metadata_viewer_stream->stream->metadata_received >
-					metadata_viewer_stream->metadata_sent) {
-			/*
-			 * We prevent the client from reading a data stream as
-			 * long as there is metadata left to consume. This
-			 * ensures that the client won't receive data of which
-			 * it can't make sense.
-			 */
-			get_packet_err = true;
-		}
-		pthread_mutex_unlock(&metadata_viewer_stream->stream->lock);
-		viewer_stream_put(metadata_viewer_stream);
-		if (get_packet_err) {
-			reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
-			reply.flags |= LTTNG_VIEWER_FLAG_NEW_METADATA;
-			goto send_reply_nolock;
-		}
-	}
-
 	pthread_mutex_lock(&vstream->stream->lock);
-	/*
-	 * The vstream->stream_fd used here has been opened by
-	 * get_next_index. It is opened there because this is what
-	 * allows us to grab a reference to the file with stream lock
-	 * held, thus protecting us against overwrite caused by
-	 * tracefile rotation. Since tracefile rotation unlinks the old
-	 * data file, we are ensured that we won't have our data
-	 * overwritten under us.
-	 */
-	ret = check_new_streams(conn);
-	if (ret < 0) {
-		goto end_free;
-	} else if (ret == 1) {
-		reply.status = htobe32(LTTNG_VIEWER_GET_PACKET_ERR);
-		reply.flags |= LTTNG_VIEWER_FLAG_NEW_STREAM;
-		goto send_reply;
-	}
 
 	len = be32toh(get_packet_info.len);
 	data = zmalloc(len);