projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd: tracefile rotation: viewer opening missing index file
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
stream.c
diff --git
a/src/bin/lttng-relayd/stream.c
b/src/bin/lttng-relayd/stream.c
index 3c61e3532e1fd2b810b278f9cb9c5c98391444af..4d3d37a2bc91d745b8e6ee83935aa623f27b3db9 100644
(file)
--- a/
src/bin/lttng-relayd/stream.c
+++ b/
src/bin/lttng-relayd/stream.c
@@
-644,7
+644,9
@@
end:
stream_put(stream);
stream = NULL;
}
stream_put(stream);
stream = NULL;
}
- lttng_trace_chunk_put(current_trace_chunk);
+ if (acquired_reference) {
+ lttng_trace_chunk_put(current_trace_chunk);
+ }
return stream;
error_no_alloc:
return stream;
error_no_alloc:
@@
-956,7
+958,7
@@
int stream_init_packet(struct relay_stream *stream, size_t packet_size,
stream->stream_handle,
stream->tracefile_size_current, packet_size,
stream->tracefile_current_index, new_file_index);
stream->stream_handle,
stream->tracefile_size_current, packet_size,
stream->tracefile_current_index, new_file_index);
- tracefile_array_file_rotate(stream->tfa);
+ tracefile_array_file_rotate(stream->tfa
, TRACEFILE_ROTATE_WRITE
);
stream->tracefile_current_index = new_file_index;
if (stream->stream_fd) {
stream->tracefile_current_index = new_file_index;
if (stream->stream_fd) {
@@
-1093,6
+1095,7
@@
int stream_update_index(struct relay_stream *stream, uint64_t net_seq_num,
ret = relay_index_try_flush(index);
if (ret == 0) {
ret = relay_index_try_flush(index);
if (ret == 0) {
+ tracefile_array_file_rotate(stream->tfa, TRACEFILE_ROTATE_READ);
tracefile_array_commit_seq(stream->tfa);
stream->index_received_seqcount++;
*flushed = true;
tracefile_array_commit_seq(stream->tfa);
stream->index_received_seqcount++;
*flushed = true;
@@
-1186,6
+1189,7
@@
int stream_add_index(struct relay_stream *stream,
}
ret = relay_index_try_flush(index);
if (ret == 0) {
}
ret = relay_index_try_flush(index);
if (ret == 0) {
+ tracefile_array_file_rotate(stream->tfa, TRACEFILE_ROTATE_READ);
tracefile_array_commit_seq(stream->tfa);
stream->index_received_seqcount++;
stream->pos_after_last_complete_data_index += index->total_size;
tracefile_array_commit_seq(stream->tfa);
stream->index_received_seqcount++;
stream->pos_after_last_complete_data_index += index->total_size;
This page took
0.025271 seconds
and
4
git commands to generate.