Merged all the way to 2.4, thanks! Jérémie
On Fri, Nov 21, 2014 at 12:31 PM, Mathieu Desnoyers <[email protected]> wrote: > When we pass to the 2nd sub-file (or following sub-files) of a stream in > relayd, the live timer has no visible effect from a live reader > perspective, and then everything is flushed when we reach the following > sub-file. > > This is caused by the reset of stream->total_index_received after each > tracefile rotation. It should keep on incrementing to match what is > expected by check in check_index_status(): > > (rstream->total_index_received <= vstream->last_sent_index) > > Fixes #863 > > Signed-off-by: Mathieu Desnoyers <[email protected]> > --- > src/bin/lttng-relayd/main.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c > index 00b8735..03ea108 100644 > --- a/src/bin/lttng-relayd/main.c > +++ b/src/bin/lttng-relayd/main.c > @@ -2333,7 +2333,6 @@ int relay_process_data(struct relay_connection *conn) > stream->tracefile_size, > stream->tracefile_count, > relayd_uid, relayd_gid, stream->fd, > &(stream->tracefile_count_current), > &stream->fd); > - stream->total_index_received = 0; > pthread_mutex_unlock(&stream->viewer_stream_rotation_lock); > if (ret < 0) { > ERR("Rotating stream output file"); > -- > 2.1.1 > -- Jérémie Galarneau EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
