From: Mathieu Desnoyers Date: Fri, 21 Nov 2014 17:31:39 +0000 (+0100) Subject: Fix: Live tracing does not honor live timer after first tracefile with tracefile... X-Git-Tag: v2.6.0-rc4~34 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=7c9e69f679671d96fc04f3f1df32d167f708ed59;p=lttng-tools.git Fix: Live tracing does not honor live timer after first tracefile with tracefile rotation 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 Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index ba7596c7e..0fad1264a 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -2337,7 +2337,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");