Fix: relayd: live: erroneous message timestamp observed from live viewer

[lttng-tools.git] / src / bin / lttng-relayd / viewer-stream.c

diff --git a/src/bin/lttng-relayd/viewer-stream.c b/src/bin/lttng-relayd/viewer-stream.c
index 511eaad93afbb23a6c2799eeb3a154e867b7d4bf..a18f21ad74aeea16f836df60ae38f99d154ec12f 100644 (file)
--- a/src/bin/lttng-relayd/viewer-stream.c
+++ b/src/bin/lttng-relayd/viewer-stream.c
@@ -21,6 +21,7 @@
 
 static void viewer_stream_destroy(struct relay_viewer_stream *vstream)
 {
+       lttng_trace_chunk_put(vstream->stream_file.trace_chunk);
        free(vstream->path_name);
        free(vstream->channel_name);
        free(vstream);
@@ -40,12 +41,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
                enum lttng_viewer_seek seek_t)
 {
        struct relay_viewer_stream *vstream = NULL;
-       const bool acquired_reference = lttng_trace_chunk_get(trace_chunk);
 
        ASSERT_LOCKED(stream->lock);
-       if (!acquired_reference) {
-               goto error;
-       }
 
        vstream = zmalloc(sizeof(*vstream));
        if (!vstream) {
@@ -53,8 +50,14 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
                goto error;
        }
 
+       if (trace_chunk) {
+               const bool acquired_reference = lttng_trace_chunk_get(
+                               trace_chunk);
+
+               assert(acquired_reference);
+       }
+
        vstream->stream_file.trace_chunk = trace_chunk;
-       trace_chunk = NULL;
        vstream->path_name = lttng_strndup(stream->path_name, LTTNG_VIEWER_PATH_MAX);
        if (vstream->path_name == NULL) {
                PERROR("relay viewer path_name alloc");
@@ -183,6 +186,8 @@ struct relay_viewer_stream *viewer_stream_create(struct relay_stream *stream,
                                vstream);
        }
 
+       vstream->last_seen_rotation_count = stream->completed_rotation_count;
+
        /* Globally visible after the add unique. */
        lttng_ht_node_init_u64(&vstream->stream_n, stream->stream_handle);
        urcu_ref_init(&vstream->ref);
@@ -194,9 +199,6 @@ error:
        if (vstream) {
                viewer_stream_destroy(vstream);
        }
-       if (trace_chunk && acquired_reference) {
-               lttng_trace_chunk_put(trace_chunk);
-       }
        return NULL;
 }
 
@@ -300,7 +302,15 @@ void viewer_stream_sync_tracefile_array_tail(struct relay_viewer_stream *vstream
        if (seq_tail == -1ULL) {
                seq_tail = 0;
        }
-       vstream->index_sent_seqcount = seq_tail;
+
+       /*
+        * Move the index sent seqcount forward if it was lagging behind
+        * the new tail of the tracefile array. If the current
+        * index_sent_seqcount is already further than the tracefile
+        * array tail position, keep its current position.
+        */
+       vstream->index_sent_seqcount = seq_tail > vstream->index_sent_seqcount ?
+                       seq_tail : vstream->index_sent_seqcount;
 }
 
 /*