X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_ust;h=cc3aed9cfcddd38364f6ff89fae1166461ff8e67;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hp=bba2d8700541590f849f074650f24cc51c4b9142;hpb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76;p=lttng-tools.git diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust index bba2d8700..cc3aed9cf 100755 --- a/tests/regression/tools/regen-metadata/test_ust +++ b/tests/regression/tools/regen-metadata/test_ust @@ -1,19 +1,9 @@ #!/bin/bash # -# Copyright (C) - 2015 Julien Desfossez +# Copyright (C) 2015 Julien Desfossez # -# This library is free software; you can redistribute it and/or modify it under -# the terms of the GNU Lesser General Public License as published by the Free -# Software Foundation; version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -# details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this library; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# SPDX-License-Identifier: LGPL-2.1-only + TEST_DESC="Streaming - User space tracing" CURDIR=$(dirname $0)/ @@ -25,11 +15,10 @@ TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" SESSION_NAME="stream" EVENT_NAME="tp:tptest" -PID_RELAYD=0 -TRACE_PATH=$(mktemp -d) +TRACE_PATH=$(mktemp --tmpdir -d tmp.test_regen_metadata_ust_trace_path.XXXXXX) -NUM_TESTS=33 +NUM_TESTS=39 source $TESTDIR/utils/utils.sh @@ -50,14 +39,17 @@ function enable_channel_per_pid() function test_ust_streaming () { - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") + local metadata_path diag "Test UST streaming with metadata regeneration" create_lttng_session_uri $SESSION_NAME net://localhost enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first} \ + --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 & start_lttng_tracing_ok $SESSION_NAME @@ -65,30 +57,43 @@ function test_ust_streaming () # Wait for the applications started in background wait - regenerate_metadata_ok $SESSION_NAME + # Expect a valid trace stop_lttng_tracing_ok $SESSION_NAME - destroy_lttng_session_ok $SESSION_NAME - # Validate test + validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* + + # Find the metadata file + metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* -name "metadata") + + # Empty the metadata file + echo -n > "$metadata_path" + + start_lttng_tracing_ok $SESSION_NAME + regenerate_metadata_ok $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + + # Metadata file must have been regenerated validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME* - if [ $? -eq 0 ]; then - # Only delete if successful - rm -rf $TRACE_PATH - fi + destroy_lttng_session_ok $SESSION_NAME + + rm -rf "$TRACE_PATH" rm -f ${file_sync_after_first} rm -f ${file_sync_before_last} } function test_ust_local () { - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") + local metadata_path diag "Test UST local with metadata regeneration" create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first} \ + --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 & start_lttng_tracing_ok $SESSION_NAME @@ -96,31 +101,43 @@ function test_ust_local () # Wait for the applications started in background wait - regenerate_metadata_ok $SESSION_NAME + # Expect a valid trace stop_lttng_tracing_ok $SESSION_NAME - destroy_lttng_session_ok $SESSION_NAME - # Validate test + validate_trace $EVENT_NAME "$TRACE_PATH" + + # Find the metadata file + metadata_path=$(find "$TRACE_PATH"* -name "metadata") + + # Empty the metadata file + echo -n > "$metadata_path" + + start_lttng_tracing_ok $SESSION_NAME + regenerate_metadata_ok $SESSION_NAME + stop_lttng_tracing_ok $SESSION_NAME + + # Metadata file must have been regenerated validate_trace $EVENT_NAME $TRACE_PATH - if [ $? -eq 0 ]; then - # Only delete if successful - rm -rf $TRACE_PATH - fi + destroy_lttng_session_ok $SESSION_NAME + + rm -rf "$TRACE_PATH" rm -f ${file_sync_after_first} rm -f ${file_sync_before_last} } function test_ust_pid () { - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") diag "Test UST per-pid with metadata regeneration (expect failure)" create_lttng_session_ok $SESSION_NAME $TRACE_PATH enable_channel_per_pid $SESSION_NAME "channel0" enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0" - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first} \ + --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 & start_lttng_tracing_ok $SESSION_NAME @@ -144,14 +161,16 @@ function test_ust_pid () function test_ust_live () { - local file_sync_after_first=$(mktemp -u) - local file_sync_before_last=$(mktemp -u) + local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX") + local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX") diag "Test UST live with metadata regeneration (expect failure)" create_lttng_session_uri $SESSION_NAME net://localhost --live enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME - $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 & + $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \ + --sync-after-first-event ${file_sync_after_first} \ + --sync-before-last-event ${file_sync_before_last} >/dev/null 2>&1 & start_lttng_tracing_ok $SESSION_NAME