diff options
| author | Brian Behlendorf <[email protected]> | 2022-02-13 14:22:00 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-02-13 14:22:00 -0800 |
| commit | b7baf49bd331505f83bef0a7dcf5df777e5192cc (patch) | |
| tree | 60fe506b84af6102fb47f7136d8caf22313550ec | |
| parent | 10271af05c29da0b5f49d2fccb04f8394a02d27e (diff) | |
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 <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #13091
| -rwxr-xr-x | tests/test-runner/bin/zts-report.py.in | 2 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 146188c8f..f3a454722 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -283,8 +283,6 @@ if sys.platform.startswith('freebsd'): elif sys.platform.startswith('linux'): maybe.update({ '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], 'fault/auto_spare_shared': ['FAIL', '11889'], 'io/io_uring': ['SKIP', 'io_uring support required'], diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh index 922e35125..6bbd46289 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_expand/zpool_expand_001_pos.ksh @@ -72,7 +72,7 @@ log_onexit cleanup 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_must truncate -s $org_size $FILE_LO DEV1=$(losetup -f) @@ -144,7 +144,7 @@ for type in " " mirror raidz draid; do if [[ $? -ne 0 ]] ; then log_fail "pool $TESTPOOL1 has not expanded" fi - elif [[ $type == "draid" ]]; then + elif [[ $type == "draid:1s" ]]; then typeset expansion_size=$((2*($exp_size-$org_size))) zpool history -il $TESTPOOL1 | \ grep "pool '$TESTPOOL1' size:" | \ |