summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ztest/ztest.c
diff options
context:
space:
mode:
authorKeith M Wesolowski <wesolows@foobazco.org>2013-08-26 23:02:51 +0000
committerKeith M Wesolowski <wesolows@foobazco.org>2013-08-26 23:03:09 +0000
commitd907c5084d3f67c85c5551ee093457940f8aec17 (patch)
tree2af3e26e19e6cd0eb5d9cc739dd27233be6b4f2d /usr/src/cmd/ztest/ztest.c
parent6344b441ffaa746030673ed598c637141b24f080 (diff)
parent69962b5647e4a8b9b14998733b765925381b727e (diff)
downloadillumos-joyent-d907c5084d3f67c85c5551ee093457940f8aec17.tar.gz
[illumos-gate merge]
commit 69962b5647e4a8b9b14998733b765925381b727e 4045 zfs write throttle & i/o scheduler performance work commit 7e0e2549bfaa531aff576083ab0c07f84fa8fb27 3845 beadm doesn't work in non-global zones commit dc986d9f4cb40f3ff88fe0d9c9fb3a51ad50f0d9 4054 dis sometimes decides random symbols are functions commit edd4ab01432cfb07428329ad6e8071e8923d0b20 3194 dis crashes disassembling aes Conflicts: usr/src/uts/common/fs/zfs/vdev_queue.c usr/src/uts/common/fs/zfs/sys/zio.h usr/src/uts/common/fs/zfs/sys/vdev_impl.h usr/src/uts/common/fs/zfs/sys/dsl_dir.h usr/src/uts/common/fs/zfs/dsl_pool.c usr/src/uts/common/fs/zfs/arc.c usr/src/lib/libbe/common/be_list.c
Diffstat (limited to 'usr/src/cmd/ztest/ztest.c')
-rw-r--r--usr/src/cmd/ztest/ztest.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/usr/src/cmd/ztest/ztest.c b/usr/src/cmd/ztest/ztest.c
index 390061a8c5..9d3caf479d 100644
--- a/usr/src/cmd/ztest/ztest.c
+++ b/usr/src/cmd/ztest/ztest.c
@@ -184,7 +184,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = {
extern uint64_t metaslab_gang_bang;
extern uint64_t metaslab_df_alloc_threshold;
-extern uint64_t zfs_deadman_synctime;
+extern uint64_t zfs_deadman_synctime_ms;
static ztest_shared_opts_t *ztest_shared_opts;
static ztest_shared_opts_t ztest_opts;
@@ -5325,10 +5325,10 @@ ztest_deadman_thread(void *arg)
hrtime_t delta, total = 0;
for (;;) {
- delta = (zs->zs_thread_stop - zs->zs_thread_start) /
- NANOSEC + zfs_deadman_synctime;
+ delta = zs->zs_thread_stop - zs->zs_thread_start +
+ MSEC2NSEC(zfs_deadman_synctime_ms);
- (void) poll(NULL, 0, (int)(1000 * delta));
+ (void) poll(NULL, 0, (int)NSEC2MSEC(delta));
/*
* If the pool is suspended then fail immediately. Otherwise,
@@ -5339,12 +5339,12 @@ ztest_deadman_thread(void *arg)
if (spa_suspended(spa)) {
fatal(0, "aborting test after %llu seconds because "
"pool has transitioned to a suspended state.",
- zfs_deadman_synctime);
+ zfs_deadman_synctime_ms / 1000);
return (NULL);
}
vdev_deadman(spa->spa_root_vdev);
- total += zfs_deadman_synctime;
+ total += zfs_deadman_synctime_ms/1000;
(void) printf("ztest has been running for %lld seconds\n",
total);
}
@@ -6073,7 +6073,7 @@ main(int argc, char **argv)
(void) setvbuf(stdout, NULL, _IOLBF, 0);
dprintf_setup(&argc, argv);
- zfs_deadman_synctime = 300;
+ zfs_deadman_synctime_ms = 300000;
ztest_fd_rand = open("/dev/urandom", O_RDONLY);
ASSERT3S(ztest_fd_rand, >=, 0);