Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: Fix zpool_expand_001_pos 

The dRAID section of the zpool_expand_001_pos test would reliably fail
because the calculated expansion size assumed the dRAID top-level vdev
was created with a distributed spare.  Create the vdev as expected to
resolve the test failure.

This test case flaw was accidentally caused by changing the default
number of dRAID distributed spares from one to zero while dRAID was
being developed.

Additionally, remove zpool_expand_005_pos from the list of possible
faulty tests.  It appears to be passing consistently in my testing.

Reviewed by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #13091
This commit is contained in:
Brian Behlendorf 2022-02-13 14:22:00 -08:00 committed by GitHub
parent 10271af05c
commit b7baf49bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test-runner/bin/zts-report.py.in
View File

@ -283,8 +283,6 @@ if sys.platform.startswith('freebsd'):
elif sys.platform.startswith('linux'): elif sys.platform.startswith('linux'):
maybe.update({ maybe.update({
'cli_root/zfs_rename/zfs_rename_002_pos': ['FAIL', known_reason], 'cli_root/zfs_rename/zfs_rename_002_pos': ['FAIL', known_reason],
'cli_root/zpool_expand/zpool_expand_001_pos': ['FAIL', known_reason],
'cli_root/zpool_expand/zpool_expand_005_pos': ['FAIL', known_reason],
'cli_root/zpool_reopen/zpool_reopen_003_pos': ['FAIL', known_reason], 'cli_root/zpool_reopen/zpool_reopen_003_pos': ['FAIL', known_reason],
'fault/auto_spare_shared': ['FAIL', '11889'], 'fault/auto_spare_shared': ['FAIL', '11889'],
'io/io_uring': ['SKIP', 'io_uring support required'], 'io/io_uring': ['SKIP', 'io_uring support required'],

4
tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh
View File

@ -72,7 +72,7 @@ log_onexit cleanup
log_assert "zpool can be autoexpanded after set autoexpand=on on vdev expansion" log_assert "zpool can be autoexpanded after set autoexpand=on on vdev expansion"
for type in " " mirror raidz draid; do for type in " " mirror raidz draid:1s; do
log_note "Setting up loopback, scsi_debug, and file vdevs" log_note "Setting up loopback, scsi_debug, and file vdevs"
log_must truncate -s $org_size $FILE_LO log_must truncate -s $org_size $FILE_LO
DEV1=$(losetup -f) DEV1=$(losetup -f)
@ -144,7 +144,7 @@ for type in " " mirror raidz draid; do
if [[ $? -ne 0 ]] ; then if [[ $? -ne 0 ]] ; then
log_fail "pool $TESTPOOL1 has not expanded" log_fail "pool $TESTPOOL1 has not expanded"
fi fi
elif [[ $type == "draid" ]]; then elif [[ $type == "draid:1s" ]]; then
typeset expansion_size=$((2*($exp_size-$org_size))) typeset expansion_size=$((2*($exp_size-$org_size)))
zpool history -il $TESTPOOL1 | \ zpool history -il $TESTPOOL1 | \
grep "pool '$TESTPOOL1' size:" | \ grep "pool '$TESTPOOL1' size:" | \