X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Frotate_utils.sh;h=8ac2afab7aeefbf4644d205ec61a88e251e65079;hb=34764ec838debdb5fdb59e178b31a44047ea7229;hp=80b2eb75338dc8dc1f95fd73efcf01d570b50ef5;hpb=3a9c3e865f8aba96ac2b2ab443d72d1b12fd2a16;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/rotate_utils.sh b/tests/regression/tools/rotation/rotate_utils.sh
index 80b2eb753..8ac2afab7 100644
--- a/tests/regression/tools/rotation/rotate_utils.sh
+++ b/tests/regression/tools/rotation/rotate_utils.sh
@@ -1,19 +1,8 @@
 #!/bin/bash
 #
-# Copyright (C) - 2017 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
 #
-# 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
 
 # Clean everything under directory but keep directory
 function clean_path ()
@@ -26,12 +15,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 ()
@@ -39,54 +41,49 @@ function validate_test_chunks ()
 	local_path=$1
 	today=$2
 	app_path=$3
-	domain=$4
-	per_pid=$5
+	shift 3
+	domains=("$@")
 
-	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
+	# Validate that only 2 chunks are present
 	nb_chunk=$(ls -A $local_path | wc -l)
-	test $nb_chunk -eq 3
-	ok $? "${local_path} contains 3 chunks only"
+	test $nb_chunk -eq 2
+	ok $? "${local_path} contains 2 chunks only"
 
 	# Check if the first and second chunk folders exist and they contain a ${app_path}/metadata file.
-	for chunk in $(seq 1 2); do
+	for chunk in $(seq 0 1); 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.
-	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"
+	for chunk in $(seq 0 1); do
+		local stale_files
+
+		stale_files=$(ls -A $local_path/${chunk_pattern}-${chunk})
+		for domain in "${domains[@]}"; do
+			stale_files=$(echo "$stale_files" | grep -v $domain)
+		done
+		nr_stale=$(echo -n "$stale_files" | wc -l)
+		ok "$nr_stale" "No stale folders in chunk ${chunk} directory"
 	done
 
 	# 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
+	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-0 10
 
 	# Chunk 2: 20 events
-	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-2 20
+	validate_trace_count $EVENT_NAME $local_path/${chunk_pattern}-1 20
 
-	# Chunk 3: 0 event
-	# 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
-	fi
+	shopt -u extglob
 }
 
 function rotate_timer_test ()
@@ -99,6 +96,11 @@ function rotate_timer_test ()
 	nr_iter=0
 	expected_chunks=3
 
+	# Wait for the "archives" folder to appear after the first rotation
+	until [ -d $local_path ]; do
+	    sleep 1
+	done
+
 	# Wait for $expected_chunks to be generated, timeout after
 	# 3 * $expected_chunks * 0.5s.
 	# On a laptop with an empty session, a local rotation takes about 200ms,
@@ -112,27 +114,27 @@ function rotate_timer_test ()
 		sleep 1
 	done
 	test $nr -ge $expected_chunks
-	ok $? "Generated $nr chunks in $(($nr_iter))s"
+	ok $? "Generated at least $nr chunks in $(($nr_iter))s"
 	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
 	if test $per_pid = 1; then
-		validate_trace_empty $local_path/${chunk_pattern}-1
-		nr=$(ls $local_path/${chunk_pattern}-2/ust | wc -l)
-		test $nr = 0
+		validate_trace_empty $local_path/${chunk_pattern}-0
+		nr=$(find $local_path/${chunk_pattern}-1/ | wc -l)
+		# contains self and may contain ust/ subdir (local) or not (remote).
+		test $nr -le 2
 		ok $? "Chunk 2 is empty"
-		nr=$(ls $local_path/${chunk_pattern}-3/ust | wc -l)
-		test $nr = 0
+		nr=$(find $local_path/${chunk_pattern}-2/ | wc -l)
+		# contains self and may contain ust/ subdir (local) or not (remote).
+		test $nr -le 2
 		ok $? "Chunk 3 is empty"
 	else
 		while [ $i -le $expected_chunks ]; do
@@ -140,4 +142,23 @@ function rotate_timer_test ()
 			i=$(($i+1))
 		done
 	fi
+	shopt -u extglob
+}
+
+function trace_until_n_archives ()
+{
+	local produce_events=$1
+	local trace_path=$2
+	local target_archive_count=$3
+	local archive_count=0
+
+	diag "Waiting for $target_archive_count size-based rotations to occur"
+	while [[ archive_count -lt $target_archive_count ]]
+	do
+		archive_count=$(find "$trace_path" -mindepth 2 -maxdepth 2 -type d -path "*archives*" | wc -l)
+		$produce_events 2000
+	done
+
+	[[ $archive_count -eq $target_archive_count ]]
+	ok $? "Found $target_archive_count trace archives resulting from trace archive rotations"
 }