diff options
author | bunder2015 <[email protected]> | 2019-01-03 15:15:46 -0500 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2019-01-03 12:15:46 -0800 |
commit | 5365b0747a51edeef9c24213929eafb0444ccb78 (patch) | |
tree | eb74b4b1609d0139381a35004262a274c8f900cf /tests | |
parent | 65ca2c1eb9af3c3fb2d221aabc2afa5db7b0f8cc (diff) |
Add missing MMP status code to libzfs_status
When MMP was merged the status codes in libzfs_status were not
updated to add the status code for ZPOOL_STATUS_IO_FAILURE_MMP. This
commit corrects this and adds comments to help keep track of which
code is used for which status.
Reviewed-by: Olaf Faaland <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: bunder2015 <[email protected]>
Closes #8148
Closes #8222
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh index f4d97f147..f51f81ce8 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_errata3.ksh @@ -62,7 +62,8 @@ log_assert "Verify that Errata 3 is properly handled" uncompress_pool log_must zpool import -d /$TESTPOOL/ $POOL_NAME -log_must eval "zpool status | grep -q Errata" +log_must eval "zpool status $POOL_NAME | grep -q Errata" +log_must eval "zpool status $POOL_NAME | grep -q ZFS-8000-ER" log_must eval "echo 'password' | zfs load-key $POOL_NAME/testfs" log_must eval "echo 'password' | zfs load-key $POOL_NAME/testvol" @@ -95,5 +96,6 @@ log_must zfs destroy -r $POOL_NAME/testvol log_must zpool export $POOL_NAME log_must zpool import -d /$TESTPOOL/ $POOL_NAME -log_mustnot eval "zpool status | grep -q Errata" +log_mustnot eval "zpool status $POOL_NAME | grep -q Errata" +log_mustnot eval "zpool status $POOL_NAME | grep -q ZFS-8000-ER" log_pass "Errata 3 is properly handled" |