X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_ust;h=a482213236073c4c9a0ef310d402a1afd29afbdd;hb=ae26b182aecec9d0cdd1fa70378369c69cfac182;hp=2144b835a4066c0caa46ba9845880f118e58ee53;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index 2144b835a..a48221323 100755
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -16,9 +16,9 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_regen_metadata_ust_trace_path.XXXXXX)
 
-NUM_TESTS=33
+NUM_TESTS=47
 
 source $TESTDIR/utils/utils.sh
 
@@ -39,8 +39,9 @@ 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 -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "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
@@ -56,24 +57,35 @@ 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 -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "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
@@ -89,24 +101,34 @@ 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 -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "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
@@ -139,8 +161,8 @@ 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 -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp -u -t "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
@@ -170,14 +192,40 @@ 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"
+bail_out_if_no_babeltrace
 
 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