X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Frotate_utils.sh;h=3d622decaf7d4b43d494973a9d96092b4400c45d;hb=5da3fc8579a9f93ea4767729a107784bf2d034ae;hp=13b158abcf96ef64d6feb2a0ebd3f34c2c347605;hpb=ef96836ca0f16e7afe7b815cc3a3752fb8ea0399;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 13b158abc..3d622deca 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -26,12 +26,25 @@ function clean_path ()
 	set +u
 }
 
-function set_chunk_pattern ()
+# The extglob shell option must be enabled to use the pattern generated by this
+# function (shopt -s extglob/ shopt -u extglob).
+# The pattern returned by this function is to validate the form:
+#    YYYYMMDDTHHMMSS[+-]HHMM-YYYYMMDDTHHMMSS[+-]HHMM
+#
+# Where YYYYMMDD is today or tomorrow. Tomorrow must be supported in case where
+# the chunks are generated close to midnight and one ends up the following day.
+function get_chunk_pattern ()
 {
-	# Need to call this function after $today has been set.
+	local today=$1
+	tommorow=$(date +%Y%m%d -d "${today}+1days")
+	pattern_hour_min="[0-9][0-9][0-9][0-9]"
+	pattern_hour_min_sec="${pattern_hour_min}[0-9][0-9]"
+
+	base_pattern="@(${today}|${tommorow})T${pattern_hour_min_sec}[+-]${pattern_hour_min}"
 
+	# Return the pattern
 	# YYYYMMDDTHHMMSS[+-]HHMM-YYYYMMDDTHHMMSS[+-]HHMM
-	export chunk_pattern="${today}T[0-9][0-9][0-9][0-9][0-9][0-9][+-][0-9][0-9][0-9][0-9]-${today}T[0-9][0-9][0-9][0-9][0-9][0-9][+-][0-9][0-9][0-9][0-9]"
+	echo "${base_pattern}-${base_pattern}"
 }
 
 function validate_test_chunks ()
@@ -42,57 +55,55 @@ function validate_test_chunks ()
 	domain=$4
 	per_pid=$5
 
-	set_chunk_pattern
+	local path=
+	local chunk_pattern=$(get_chunk_pattern ${today})
+
+	# Enable extglob for the use of chunk_pattern
+	shopt -s extglob
+
+	# Validate that only 3 chunks are present
+	nb_chunk=$(ls -A $local_path | wc -l)
+	test $nb_chunk -eq 3
+	ok $? "${local_path} contains 3 chunks only"
 
-	# Check if the 3 chunk folders exist and they contain a ${app_path}/metadata file.
-	ls $local_path/${chunk_pattern}-1/${app_path}/metadata >/dev/null
-	ok $? "Chunk 1 exists"
-	ls $local_path/${chunk_pattern}-2/${app_path}/metadata >/dev/null
-	ok $? "Chunk 2 exists"
-	ls $local_path/${chunk_pattern}-3/${domain} >/dev/null
-	ok $? "Chunk 3 exists"
+	# Check if the first and second chunk folders exist and they contain a ${app_path}/metadata file.
+	for chunk in $(seq 1 2); do
+		path=$(ls $local_path/${chunk_pattern}-${chunk}/${app_path}/metadata)
+		ok $? "Chunk ${chunk} exists based on path $path"
+	done
+
+	# In per-pid the last chunk (3) must be empty.
+	if [ "${per_pid}" -eq "1" ]; then
+		test -z "$(ls -A $local_path/${chunk_pattern}-3/${domain})"
+		ok $? "Chunk 3 is empty per-pid mode"
+	else
+		path=$(ls $local_path/${chunk_pattern}-3/${app_path}/metadata)
+		ok $? "Chunk 3 exists based on path $path"
+	fi
 
 	# Make sure we don't have anything else in the first 2 chunk directories
 	# besides the kernel folder.
-	nr_stale=$(\ls $local_path/${chunk_pattern}-1 | grep -v $domain | wc -l)
-	ok $nr_stale "No stale folders in chunk 1 directory"
-	nr_stale=$(\ls $local_path/${chunk_pattern}-2 | grep -v $domain | wc -l)
-	ok $nr_stale "No stale folders in chunk 2 directory"
+	for chunk in $(seq 1 2); do
+		nr_stale=$(ls -A $local_path/${chunk_pattern}-${chunk} | grep -v $domain | wc -l)
+		ok $nr_stale "No stale folders in chunk ${chunk} directory"
+	done
 
-	# We expect a session of 30 events
+	# We expect a complete session of 30 events
 	validate_trace_count $EVENT_NAME $local_path 30
 
 	# Chunk 1: 10 events
 	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-1 10
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $local_path/${chunk_pattern}-1
-	fi
 
 	# Chunk 2: 20 events
 	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-2 20
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $local_path/${chunk_pattern}-2
-	fi
 
 	# Chunk 3: 0 event
-	# Do not check in per-pid, because the folder is really empty, no metadata
-	# or stream files.
-	if test $per_pid = 1; then
-		rm -rf $local_path/${chunk_pattern}-3
-	else
+	# Trace for chunk number 3 can only be read in per-uid mode since in
+	# per-pid mode it is empty (no metadata or stream files).
+	if test $per_pid = 0; then
 		validate_trace_empty $local_path/${chunk_pattern}-3
-		if [ $? -eq 0 ]; then
-			# Only delete if successful
-			rm -rf $local_path/${chunk_pattern}-3
-		fi
 	fi
-
-	# The session folder after all chunks have been removed is empty
-	test -z "$(\ls -A $local_path)"
-	empty=$?
-	ok $empty "Trace folder is now empty"
+	shopt -u extglob
 }
 
 function rotate_timer_test ()
@@ -122,13 +133,12 @@ function rotate_timer_test ()
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
-	now=$(date +%Y%m%d)
-	test $today = $now
-	ok $? "Date did not change during the test"
-
 	# Make sure the 10 first chunks are valid empty traces
 	i=1
-	set_chunk_pattern
+	local chunk_pattern=$(get_chunk_pattern ${today})
+
+	# Enable extglob for the use of chunk_pattern
+	shopt -s extglob
 
 	# In a per-pid setup, only the first chunk is a valid trace, the other
 	# chunks should be empty folders
@@ -146,4 +156,5 @@ function rotate_timer_test ()
 			i=$(($i+1))
 		done
 	fi
+	shopt -u extglob
 }