ctf: make src.ctf.fs group inputs by UUID in `babeltrace.support-info` query
authorSimon Marchi <simon.marchi@efficios.com>
Thu, 8 Aug 2019 19:22:02 +0000 (15:22 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 4 Sep 2019 15:58:23 +0000 (11:58 -0400)
commit1d3426bc601401d5d74f8a6b07b9af2acaa0a700
treedce09bdd02e534c6246c363a712f2a09d2701905
parent26aa224b21f19b76f649af00e283d20cc4199124
ctf: make src.ctf.fs group inputs by UUID in `babeltrace.support-info` query

When replying to the `babeltrace.support-info` query, the src.ctf.fs component
class currently groups all recognized CTF inputs in a single `ctf`
group.  It then internally groups traces with the same UUID together to
process them as a single trace (to support LTTng's session rotation
feature).

This commit makes it group the inputs by UUID, which will naturally
assign all inputs beloning to one logical trace to one instance of
src.ctf.fs.  Input traces without UUID are not placed in a group,
meaning that they will have their own src.ctf.fs component.

This paves the way to simplifying src.ctf.fs to support only a single
(logical) trace.

I added a test CTF trace for this, `session-rotation`, which consists of
two traces with three rotation chunks each.  We therefore expect to have
two groups with three inputs each.

The new Python test checks the `babeltrace.support-info` query directly.
I also added a new .expect file for this new test trace, it will at
least verify that we have the right number of streams (which will be off
if the grouping doesn't work as intended).

Change-Id: I13374fff9bafa94c5d8f4b6bac1c64afadef7a46
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1844
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
Reviewed-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
61 files changed:
src/plugins/ctf/fs-src/query.c
tests/Makefile.am
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10352-20190826-155748/metadata [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/20190826T155753-0400-3/ust/pid/hello-ust-10353-20190826-155748/metadata [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10352-20190826-155748/metadata [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155748-0400-20190826T155751-0400-1/ust/pid/hello-ust-10353-20190826-155748/metadata [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10352-20190826-155748/metadata [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_0 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_1 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_2 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/chan_3 [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_0.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_1.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_2.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/index/chan_3.idx [new file with mode: 0644]
tests/data/ctf-traces/succeed/session-rotation/archives/20190826T155750-0400-20190826T155753-0400-2/ust/pid/hello-ust-10353-20190826-155748/metadata [new file with mode: 0644]
tests/data/plugins/src.ctf.fs/succeed/trace-session-rotation.expect [new file with mode: 0644]
tests/plugins/src.ctf.fs/Makefile.am
tests/plugins/src.ctf.fs/query/test_query_support_info [new file with mode: 0755]
tests/plugins/src.ctf.fs/query/test_query_support_info.py [new file with mode: 0644]
tests/plugins/src.ctf.fs/succeed/test_succeed
This page took 0.029512 seconds and 4 git commands to generate.