diff options
Diffstat (limited to 'usr')
3 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_off.ksh b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_off.ksh index 8bef86a0ff..cb35351d7b 100755 --- a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_off.ksh +++ b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_off.ksh @@ -16,6 +16,7 @@ # # Copyright (c) 2017 by Lawrence Livermore National Security, LLC. +# Copyright 2019 Joyent, Inc. # # DESCRIPTION: @@ -44,7 +45,7 @@ verify_runnable "both" function cleanup { default_cleanup_noexit - log_must set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT + log_must set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT log_must set_tunable64 zfs_multihost_interval $MMP_INTERVAL_DEFAULT log_must rm -f $PREV_UBER $CURR_UBER log_must mmp_clear_hostid @@ -54,7 +55,7 @@ log_assert "mmp thread won't write uberblocks with multihost=off" log_onexit cleanup log_must set_tunable64 zfs_multihost_interval $MMP_INTERVAL_MIN -log_must set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_LONG +log_must set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_LONG log_must mmp_set_hostid $HOSTID1 default_setup_noexit $DISK diff --git a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_thread.ksh b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_thread.ksh index 07384c6231..c8478a03bd 100755 --- a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_thread.ksh +++ b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_thread.ksh @@ -16,6 +16,7 @@ # # Copyright (c) 2017 by Lawrence Livermore National Security, LLC. +# Copyright 2019 Joyent, Inc. # # DESCRIPTION: @@ -39,7 +40,7 @@ verify_runnable "both" function cleanup { default_cleanup_noexit - log_must set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT + log_must set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT log_must rm -f $PREV_UBER $CURR_UBER log_must mmp_clear_hostid } @@ -47,7 +48,7 @@ function cleanup log_assert "mmp thread writes uberblocks (MMP)" log_onexit cleanup -log_must set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_LONG +log_must set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_LONG log_must mmp_set_hostid $HOSTID1 default_setup_noexit $DISK diff --git a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh index 0cb38f8899..7c12b7fbdd 100755 --- a/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh +++ b/usr/src/test/zfs-tests/tests/functional/mmp/mmp_on_uberblocks.ksh @@ -16,6 +16,7 @@ # # Copyright (c) 2017 by Lawrence Livermore National Security, LLC. +# Copyright 2019 Joyent, Inc. # # DESCRIPTION: @@ -45,14 +46,14 @@ MAX=$((EXPECTED + FUDGE)) function cleanup { default_cleanup_noexit - set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT + set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_DEFAULT log_must mmp_clear_hostid } log_assert "Ensure MMP uberblocks update at the correct interval" log_onexit cleanup -log_must set_tunable64 zfs_txg_timeout $TXG_TIMEOUT_LONG +log_must set_tunable32 zfs_txg_timeout $TXG_TIMEOUT_LONG log_must mmp_set_hostid $HOSTID1 default_setup_noexit "$DISKS" |