test: snapshot after regenerate metadata

[lttng-tools.git] / tests / regression / tools / regen-metadata / test_ust

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index 2144b835a4066c0caa46ba9845880f118e58ee53..522fb6e6f04d5650ac1b8933e427e8b0e3636e5a 100755 (executable)
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -18,7 +18,7 @@ EVENT_NAME="tp:tptest"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=33
+NUM_TESTS=47
 
 source $TESTDIR/utils/utils.sh
 
@@ -41,6 +41,7 @@ function test_ust_streaming ()
 {
        local file_sync_after_first=$(mktemp -u)
        local file_sync_before_last=$(mktemp -u)
+       local metadata_path
 
        diag "Test UST streaming with metadata regeneration"
        create_lttng_session_uri $SESSION_NAME net://localhost
@@ -56,16 +57,26 @@ 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"* | grep 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}
 }
@@ -74,6 +85,7 @@ function test_ust_local ()
 {
        local file_sync_after_first=$(mktemp -u)
        local file_sync_before_last=$(mktemp -u)
+       local metadata_path
 
        diag "Test UST local with metadata regeneration"
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -89,16 +101,26 @@ 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"* | grep 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}
 }
@@ -170,6 +192,30 @@ function test_ust_live ()
        rm -f ${file_sync_before_last}
 }
 
+function test_ust_local_snapshot_after_regenerate_metadata ()
+{
+       local file_sync_before_last
+       local metadata_path
+
+       file_sync_before_last=$(mktemp -u)
+
+       diag "Test UST local snapshot after regenerate metadata"
+       create_lttng_session_ok $SESSION_NAME "$TRACE_PATH" --snapshot
+       enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+       start_lttng_tracing_ok $SESSION_NAME
+
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT
+
+       regenerate_metadata_ok $SESSION_NAME
+       lttng_snapshot_record $SESSION_NAME "$TRACE_PATH"
+       stop_lttng_tracing_ok $SESSION_NAME
+
+       validate_trace $EVENT_NAME "$TRACE_PATH"
+       destroy_lttng_session_ok $SESSION_NAME
+
+       rm -rf "$TRACE_PATH"
+}
+
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
@@ -177,7 +223,8 @@ print_test_banner "$TEST_DESC"
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
 
-tests=( test_ust_streaming test_ust_local test_ust_pid test_ust_live )
+tests=( test_ust_streaming test_ust_local test_ust_pid test_ust_live
+       test_ust_local_snapshot_after_regenerate_metadata)
 
 for fct_test in ${tests[@]};
 do