mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 11:18:52 +03:00
OpenZFS 7503 - zfs-test should tail ::zfs_dbgmsg on test failure
Authored by: Pavel Zakharov <pavel.zakharov@delphix.com> Reviewed by: John Kennedy <john.kennedy@delphix.com> Reviewed by: Matt Ahrens <mahrens@delphix.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com> Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov> Reviewed-by: George Melikov <mail@gmelikov.ru> Ported-by: Brian Behlendorf <behlendorf1@llnl.gov> Porting Notes: - Enable internal log for DEBUG builds and in zfs-tests.sh. - callbacks/zfs_dbgmsg.ksh - Dump interal log via kstat. - callbacks/zfs_dmesg.ksh - Dump dmesg log. - default.cfg - 'Test Suite Specific Commands' dropped. OpenZFS-issue: https://www.illumos.org/issues/7503 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/55a1300 Closes #6002
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
|
||||
# Use is subject to license terms.
|
||||
#
|
||||
# Copyright (c) 2012 by Delphix. All rights reserved.
|
||||
# Copyright (c) 2012, 2016 by Delphix. All rights reserved.
|
||||
#
|
||||
|
||||
. ${STF_TOOLS}/include/stf.shlib
|
||||
@@ -392,6 +392,22 @@ function log_other
|
||||
# Internal functions
|
||||
#
|
||||
|
||||
# Execute custom callback scripts on test failure
|
||||
#
|
||||
# callback script paths are stored in TESTFAIL_CALLBACKS, delimited by ':'.
|
||||
|
||||
function _execute_testfail_callbacks
|
||||
{
|
||||
typeset callback
|
||||
|
||||
print "$TESTFAIL_CALLBACKS:" | while read -d ":" callback; do
|
||||
if [[ -n "$callback" ]] ; then
|
||||
log_note "Performing test-fail callback ($callback)"
|
||||
$callback
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
# Perform cleanup and exit
|
||||
#
|
||||
# $1 - stf exit code
|
||||
@@ -402,6 +418,10 @@ function _endlog
|
||||
typeset logfile="/tmp/log.$$"
|
||||
_recursive_output $logfile
|
||||
|
||||
if [[ $1 == $STF_FAIL ]] ; then
|
||||
_execute_testfail_callbacks
|
||||
fi
|
||||
|
||||
if [[ -n $_CLEANUP ]] ; then
|
||||
typeset cleanup=$_CLEANUP
|
||||
log_onexit ""
|
||||
|
||||
@@ -1 +1 @@
|
||||
SUBDIRS = cmd include tests
|
||||
SUBDIRS = cmd include tests callbacks
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
pkgdatadir = $(datadir)/@PACKAGE@/zfs-tests/callbacks
|
||||
dist_pkgdata_SCRIPTS = \
|
||||
zfs_dbgmsg.ksh \
|
||||
zfs_dmesg.ksh
|
||||
Executable
+29
@@ -0,0 +1,29 @@
|
||||
#!/bin/ksh -p
|
||||
|
||||
#
|
||||
# This file and its contents are supplied under the terms of the
|
||||
# Common Development and Distribution License ("CDDL"), version 1.0.
|
||||
# You may only use this file in accordance with the terms of version
|
||||
# 1.0 of the CDDL.
|
||||
#
|
||||
# A full copy of the text of the CDDL should have accompanied this
|
||||
# source. A copy of the CDDL is also available via the Internet at
|
||||
# http://www.illumos.org/license/CDDL.
|
||||
#
|
||||
|
||||
#
|
||||
# Copyright (c) 2016 by Delphix. All rights reserved.
|
||||
#
|
||||
|
||||
# $1: number of lines to output (default: 200)
|
||||
typeset lines=${1:-200}
|
||||
|
||||
echo "================================================================="
|
||||
echo " Tailing last $lines lines of zfs_dbgmsg log"
|
||||
echo "================================================================="
|
||||
|
||||
sudo tail -n $lines /proc/spl/kstat/zfs/dbgmsg
|
||||
|
||||
echo "================================================================="
|
||||
echo " End of zfs_dbgmsg log"
|
||||
echo "================================================================="
|
||||
Executable
+30
@@ -0,0 +1,30 @@
|
||||
#!/bin/ksh -p
|
||||
|
||||
#
|
||||
# This file and its contents are supplied under the terms of the
|
||||
# Common Development and Distribution License ("CDDL"), version 1.0.
|
||||
# You may only use this file in accordance with the terms of version
|
||||
# 1.0 of the CDDL.
|
||||
#
|
||||
# A full copy of the text of the CDDL should have accompanied this
|
||||
# source. A copy of the CDDL is also available via the Internet at
|
||||
# http://www.illumos.org/license/CDDL.
|
||||
#
|
||||
|
||||
#
|
||||
# Copyright (c) 2016 by Delphix. All rights reserved.
|
||||
# Copyright (c) 2017 Lawrence Livermore National Security, LLC.
|
||||
#
|
||||
|
||||
# $1: number of lines to output (default: 200)
|
||||
typeset lines=${1:-200}
|
||||
|
||||
echo "================================================================="
|
||||
echo " Tailing last $lines lines of dmesg log"
|
||||
echo "================================================================="
|
||||
|
||||
sudo dmesg | tail -n $lines
|
||||
|
||||
echo "================================================================="
|
||||
echo " End of dmesg log"
|
||||
echo "================================================================="
|
||||
Reference in New Issue
Block a user