Skip to content

Commit f1659cc

Browse files
Umer Saleemtonyhutter
Umer Saleem
authored andcommitted
ZTS: Test for all known zpool feature sets
zpool_create_features_007_pos only tested for compat-2020 feature set. It would be useful to test for all known features sets. If any additional feature is found enabled that is not present in compatibility list or feature set, it should be caught and reported earlier. This commit also removes encryption from openzfsonosx-1.8.1 compatibility list. Encryption enables bookmark_v2, since it is a dependency of encryption, but not listed in openzfsonoxx-1.8.1 compatibility list. Reviewed-by: Alexander Motin <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Umer Saleem <[email protected]> Closes openzfs#15505
1 parent f863ac3 commit f1659cc

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

cmd/zpool/compatibility.d/openzfsonosx-1.8.1

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ edonr
66
embedded_data
77
empty_bpobj
88
enabled_txg
9-
encryption
109
extensible_dataset
1110
filesystem_limits
1211
hole_birth

tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_features_007_pos.ksh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
# STRATEGY:
3535
# 1. Create a pool with a known feature set.
3636
# 2. Verify only those features are active/enabled.
37+
# 3. Do this for all known feature sets
3738
#
3839

3940
verify_runnable "global"
@@ -47,8 +48,11 @@ log_onexit cleanup
4748

4849
log_assert "creates a pool with a specified feature set enabled"
4950

50-
log_must zpool create -f -o compatibility=compat-2020 $TESTPOOL $DISKS
51-
check_feature_set $TESTPOOL compat-2020
52-
log_must zpool destroy -f $TESTPOOL
51+
for compat in "$ZPOOL_COMPAT_DIR"/*
52+
do
53+
log_must zpool create -f -o compatibility="${compat##*/}" $TESTPOOL $DISKS
54+
check_feature_set $TESTPOOL "${compat##*/}"
55+
log_must zpool destroy -f $TESTPOOL
56+
done
5357

5458
log_pass "creates a pool with a specified feature set enabled"

0 commit comments

Comments
 (0)