shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

tests: minimize teardown when uneeded

Browse Source 
If test has not yet initilized any device,
make teardown a bit faster.
This commit is contained in:
Zdenek Kabelac 2015-04-29 13:37:13 +02:00
parent c5b4327f3d
commit 244ca7ee77
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/lib/aux.sh
View File

@ -140,6 +140,8 @@ teardown_devs_prefixed() {
local IFS=$IFS_NL local IFS=$IFS_NL
local dm local dm
rm -rf "$TESTDIR/dev/$prefix"*
# Resume suspended devices first # Resume suspended devices first
for dm in $(dm_info suspended,name | grep "^Suspended:.*$prefix"); do for dm in $(dm_info suspended,name | grep "^Suspended:.*$prefix"); do
echo "dmsetup resume \"${dm#Suspended:}\"" echo "dmsetup resume \"${dm#Suspended:}\""
@ -180,16 +182,16 @@ teardown_devs_prefixed() {
num_remaining_devs=$num_devs num_remaining_devs=$num_devs
done done
fi fi
udev_wait
} }
teardown_devs() { teardown_devs() {
# Delete any remaining dm/udev semaphores # Delete any remaining dm/udev semaphores
teardown_udev_cookies teardown_udev_cookies
test -z "$PREFIX" || { test ! -f MD_DEV || cleanup_md_dev
rm -rf "$TESTDIR/dev/$PREFIX"* test ! -f DEVICES || teardown_devs_prefixed "$PREFIX"
teardown_devs_prefixed "$PREFIX"
}
# NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because # NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
# prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop() # prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
@ -199,22 +201,21 @@ teardown_devs() {
test ! -f LOOP || losetup -d $(< LOOP) || true test ! -f LOOP || losetup -d $(< LOOP) || true
test ! -f LOOPFILE || rm -f $(< LOOPFILE) test ! -f LOOPFILE || rm -f $(< LOOPFILE)
fi fi
rm -f DEVICES # devs is set in prepare_devs()
not diff LOOP BACKING_DEV >/dev/null 2>&1 || rm -f BACKING_DEV not diff LOOP BACKING_DEV >/dev/null 2>&1 || rm -f BACKING_DEV
rm -f LOOP rm -f DEVICES LOOP
# Attempt to remove any loop devices that failed to get torn down if earlier tests aborted # Attempt to remove any loop devices that failed to get torn down if earlier tests aborted
test "${LVM_TEST_PARALLEL:-0}" -eq 1 -o -z "$COMMON_PREFIX" || { test "${LVM_TEST_PARALLEL:-0}" -eq 1 -o -z "$COMMON_PREFIX" || {
teardown_devs_prefixed "$COMMON_PREFIX" 1
local stray_loops=( $(losetup -a | grep "$COMMON_PREFIX" | cut -d: -f1) ) local stray_loops=( $(losetup -a | grep "$COMMON_PREFIX" | cut -d: -f1) )
test ${#stray_loops[@]} -eq 0 || { test ${#stray_loops[@]} -eq 0 || {
teardown_devs_prefixed "$COMMON_PREFIX" 1
echo "Removing stray loop devices containing $COMMON_PREFIX: ${stray_loops[@]}" echo "Removing stray loop devices containing $COMMON_PREFIX: ${stray_loops[@]}"
for i in "${stray_loops[@]}" ; do losetup -d $i ; done for i in "${stray_loops[@]}" ; do losetup -d $i ; done
# Leave test when udev processed all removed devices
udev_wait
} }
} }
# Leave test when udev processed all removed devices
udev_wait
} }
kill_sleep_kill_() { kill_sleep_kill_() {
@ -248,9 +249,8 @@ kill_listed_processes() {
} }
teardown() { teardown() {
test -f MD_DEV && cleanup_md_dev
echo -n "## teardown..." echo -n "## teardown..."
unset LVM_LOG_FILE_EPOCH
if test -f TESTNAME ; then if test -f TESTNAME ; then
@ -461,6 +461,7 @@ prepare_devs() {
local pvname=${3:-pv} local pvname=${3:-pv}
local shift=0 local shift=0
touch DEVICES
prepare_backing_dev $(($n*$devsize)) prepare_backing_dev $(($n*$devsize))
# shift start of PV devices on /dev/loopXX by 1M # shift start of PV devices on /dev/loopXX by 1M
not diff LOOP BACKING_DEV >/dev/null 2>&1 || shift=2048 not diff LOOP BACKING_DEV >/dev/null 2>&1 || shift=2048

10
test/lib/inittest.sh
View File

@ -32,7 +32,7 @@ PREFIX="${COMMON_PREFIX}$$"
if test -z "$LVM_TEST_DIR"; then LVM_TEST_DIR=$TMPDIR; fi if test -z "$LVM_TEST_DIR"; then LVM_TEST_DIR=$TMPDIR; fi
TESTDIR=$(mkdtemp "${LVM_TEST_DIR:-/tmp}" "$PREFIX.XXXXXXXXXX") || \ TESTDIR=$(mkdtemp "${LVM_TEST_DIR:-/tmp}" "$PREFIX.XXXXXXXXXX") || \
die "failed to create temporary directory in ${LVM_TEST_DIR:-$TESTOLDPWD}" die "failed to create temporary directory in ${LVM_TEST_DIR:-$TESTOLDPWD}"
RUNNING_DMEVENTD=$(pgrep dmeventd) || true RUNNING_DMEVENTD=$(pgrep dmeventd || true)
export TESTOLDPWD TESTDIR COMMON_PREFIX PREFIX RUNNING_DMEVENTD export TESTOLDPWD TESTDIR COMMON_PREFIX PREFIX RUNNING_DMEVENTD
export LVM_LOG_FILE_EPOCH=DEBUG export LVM_LOG_FILE_EPOCH=DEBUG
@ -62,7 +62,7 @@ mkdir "$LVM_SYSTEM_DIR" "$DM_DEV_DIR"
if test -n "$LVM_TEST_DEVDIR" ; then if test -n "$LVM_TEST_DEVDIR" ; then
DM_DEV_DIR=$LVM_TEST_DEVDIR DM_DEV_DIR=$LVM_TEST_DEVDIR
else else
mknod "$DM_DEV_DIR/testnull" c 1 3 || die "mknod failed"; mknod "$DM_DEV_DIR/testnull" c 1 3 || die "mknod failed"
echo >"$DM_DEV_DIR/testnull" || \ echo >"$DM_DEV_DIR/testnull" || \
die "Filesystem does support devices in $DM_DEV_DIR (mounted with nodev?)" die "Filesystem does support devices in $DM_DEV_DIR (mounted with nodev?)"
mkdir "$DM_DEV_DIR/mapper" mkdir "$DM_DEV_DIR/mapper"
@ -77,11 +77,7 @@ echo "$TESTNAME" >TESTNAME
echo "Kernel is $(uname -a)" echo "Kernel is $(uname -a)"
# Report SELinux mode # Report SELinux mode
if which getenforce &>/dev/null ; then echo "Selinux mode is $(getenforce 2>/dev/null || echo not installed)."
echo "Selinux mode is \"$(getenforce 2>/dev/null)\"."
else
echo "Selinux mode is not installed."
fi
# Set vars from utils now that we have TESTDIR/PREFIX/... # Set vars from utils now that we have TESTDIR/PREFIX/...
prepare_test_vars prepare_test_vars