c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-12 19:20:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

OpenZFS 7337 - inherit_001_pos occasionally times out

Browse Source 
Authored by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>

OpenZFS-issue: https://www.illumos.org/issues/7337
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/b021ac0
Closes #5800

Porting notes:
- Additional code refactor for better Zol and OpenZFS codebase sync
This commit is contained in:
Matthew Ahrens 2016-09-23 20:44:15 -07:00 committed by Brian Behlendorf
parent d8fa599fab
commit 409b4127ee
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
View File

@ -25,7 +25,7 @@
# Use is subject to license terms.
#
# Copyright (c) 2013 by Delphix. All rights reserved.
# Copyright (c) 2013, 2015 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
@ -370,53 +370,49 @@ function scan_state { #state-file
done
}
#
# Note that we keep this list relatively short so that this test doesn't
# time out (after taking more than 10 minutes).
#
set -A prop "checksum" "" \
"compression" "" \
"atime" "" \
"sharenfs" "" \
"recordsize" "recsize" \
"snapdir" "" \
"readonly" ""
#
# Note except for the mountpoint default value (which is handled in
# the routine itself), each property specified in the 'prop' array
# above must have a corresponding entry in the two arrays below.
#
if is_linux; then
set -A prop "checksum" "" \
"compression" "compress" \
"atime" "" \
"devices" "" \
"exec" "" \
"setuid" "" \
"recordsize" "recsize" \
"snapdir" "" \
"acltype"
set -A def_val "on" "off" "on" "on" "on" \
"on" "" \
"hidden" "off"
set -A def_val "on" "off" "on" \
"off" "" \
"hidden" \
"off"
set -A local_val "off" "on" "off" "off" "off" \
"off" "" \
"visible" "off"
set -A local_val "off" "on" "off" \
"on" "" \
"visible" \
"off"
#
# Add system specific values
#
if ! is_linux; then
prop+=("aclmode" "" \
"mountpoint" "")
def_val+=("discard" \
"")
local_val+=("groupmask" \
"$TESTDIR")
else
set -A prop "checksum" "" \
"compression" "compress" \
"atime" "" \
"devices" "" \
"exec" "" \
"setuid" "" \
"sharenfs", "" \
"recordsize" "recsize" \
"mountpoint" "" \
"snapdir" "" \
"aclmode", "" \
"aclinherit" "" \
"readonly" "rdonly"
set -A def_val "on" "off" "on" "on" "on" \
"on" "off" "" \
"" "hidden" "discard" "secure" \
"off"
set -A local_val "off" "on" "off" "off" "off" \
"off" "on" "" \
"$TESTDIR" "visible" "groupmask" "discard" \
"off"
prop+=("acltype" "")
def_val+=("off")
local_val+=("off")
fi