Disable ztest deadman timer

The ztest deadman timer has been causing false positives in the
testing VMs.  To make it easier to spot possible regressions
I'm disabling this timer.  The buildbot test infrastructure
will still mark ztest instances which take to long to complete
as failures.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Issue #1018
This commit is contained in:
Brian Behlendorf 2012-10-14 19:21:49 -07:00
parent ee7913b644
commit 26099167e6
1 changed files with 4 additions and 0 deletions

View File

@ -5289,11 +5289,13 @@ ztest_resume_thread(void *arg)
#define GRACE 300 #define GRACE 300
#if 0
static void static void
ztest_deadman_alarm(int sig) ztest_deadman_alarm(int sig)
{ {
fatal(0, "failed to complete within %d seconds of deadline", GRACE); fatal(0, "failed to complete within %d seconds of deadline", GRACE);
} }
#endif
static void static void
ztest_execute(int test, ztest_info_t *zi, uint64_t id) ztest_execute(int test, ztest_info_t *zi, uint64_t id)
@ -5550,11 +5552,13 @@ ztest_run(ztest_shared_t *zs)
(thread_func_t)ztest_resume_thread, spa, TS_RUN, NULL, 0, 0, (thread_func_t)ztest_resume_thread, spa, TS_RUN, NULL, 0, 0,
PTHREAD_CREATE_JOINABLE)), !=, NULL); PTHREAD_CREATE_JOINABLE)), !=, NULL);
#if 0
/* /*
* Set a deadman alarm to abort() if we hang. * Set a deadman alarm to abort() if we hang.
*/ */
signal(SIGALRM, ztest_deadman_alarm); signal(SIGALRM, ztest_deadman_alarm);
alarm((zs->zs_thread_stop - zs->zs_thread_start) / NANOSEC + GRACE); alarm((zs->zs_thread_stop - zs->zs_thread_start) / NANOSEC + GRACE);
#endif
/* /*
* Verify that we can safely inquire about about any object, * Verify that we can safely inquire about about any object,