shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-11 20:58:50 +03:00
Code Releases Activity

tests: handle debug.log from clvmd

Browse Source 
When clvmd starts, it starts it's own command logging into debug.log.
This is interferring with our other command debug.log.
As as sideeffect we may experience log from command,
followed but lots of zeros and continued with clvmd log.

Fix it by renaming debug.log and now we could also print this trace
to get full list of clvmd activity nicely.

Also improve some post-mortem prints from udevadm and dmsetup to
make the output more usable.
This commit is contained in:
Zdenek Kabelac 2015-04-09 13:13:36 +02:00
parent 073643c9a2
commit 1a7c9ce3bd
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/lib/aux.sh
View File

@ -48,9 +48,11 @@ prepare_clvmd() {
for i in $(seq 1 100) ; do for i in $(seq 1 100) ; do
test $i -eq 100 && die "Startup of clvmd is too slow." test $i -eq 100 && die "Startup of clvmd is too slow."
test -e "$CLVMD_PIDFILE" && break test -e "$CLVMD_PIDFILE" -a -e debug.log && break
sleep .2 sleep .2
done done
# Keep log of clvmd in separate debug file
mv debug.log clvmddebug.log
} }
prepare_dmeventd() { prepare_dmeventd() {

3
test/lib/lvm-wrapper.sh
View File

@ -38,6 +38,9 @@ case "$CMD" in
test ${LVM_DEBUG_LEVEL:-0} -lt 1 && RUN_DBG= ;; test ${LVM_DEBUG_LEVEL:-0} -lt 1 && RUN_DBG= ;;
esac esac
# Capture parallel users of debug.log file
test -z "$(fuser debug.log 2>/dev/null)" || { echo "Test suite problem: \"debug.log\" is still in use!" >&2 ; return 1 ; }
# the exec is important, because otherwise fatal signals inside "not" go unnoticed # the exec is important, because otherwise fatal signals inside "not" go unnoticed
if test -n "$abs_top_builddir"; then if test -n "$abs_top_builddir"; then
exec $RUN_DBG "$abs_top_builddir/tools/lvm" $CMD "$@" exec $RUN_DBG "$abs_top_builddir/tools/lvm" $CMD "$@"

15
test/lib/utils.sh
View File

@ -100,6 +100,11 @@ mkdtemp() {
die "$err" die "$err"
} }
# Like grep, just always print 1st. line
grep1_() {
awk -v pattern="${1}" 'NR==1 || $0~pattern' "${@:2}"
}
STACKTRACE() { STACKTRACE() {
trap - ERR trap - ERR
local i=0 local i=0
@ -129,9 +134,11 @@ STACKTRACE() {
test -z "$LVM_TEST_NODEBUG" -a -f debug.log && { test -z "$LVM_TEST_NODEBUG" -a -f debug.log && {
sed -e "s,^,## DEBUG: ,;s,$top_srcdir/\?,," < debug.log sed -e "s,^,## DEBUG: ,;s,$top_srcdir/\?,," < debug.log
echo "========= CLVMD debug log ========="
test -e clvmddebug.log && sed -e "s,^,## CLVMD: ,;s,$top_srcdir/\?,," < clvmddebug.log
test -e strace.log && sed -e "s,^,## STRACE: ,;s,$top_srcdir/\?,," < strace.log test -e strace.log && sed -e "s,^,## STRACE: ,;s,$top_srcdir/\?,," < strace.log
echo "========= Info ===========" echo "========= Info ==========="
dmsetup info -c | grep "$PREFIX" dmsetup info -c | grep1_ "$PREFIX"
echo "========= Active table ===========" echo "========= Active table ==========="
dmsetup table | grep "$PREFIX" dmsetup table | grep "$PREFIX"
echo "======== Inactive table ==========" echo "======== Inactive table =========="
@ -141,9 +148,9 @@ STACKTRACE() {
echo "======== Tree ==========" echo "======== Tree =========="
dmsetup ls --tree dmsetup ls --tree
echo "======== Recursive list of $DM_DEV_DIR ==========" echo "======== Recursive list of $DM_DEV_DIR =========="
ls -Rla "$DM_DEV_DIR" ls -Rl --hide=shm --hide=bus --hide=snd --hide=input "$DM_DEV_DIR"
for i in "/sys/block/dm-* /sys/block/loop*" ; do for i in /sys/block/dm-* /sys/block/loop* ; do
udevadm info --export-db "$i" || true udevadm info -p "$i" || true
done done
} }