Update and add test cases

Signed-off-by: Paul Dagnelie <[email protected]>
Sponsored-by: Eshtek, creators of HexOS
Sponsored-by: Klara, Inc.

Author: ihoro

cmd/zpool/zpool_vdev.c

@@ -1637,7 +1637,12 @@ construct_spec(nvlist_t *props, int argc, char **argv)
 			}
 
 			if (is_log) {
-				if (strcmp(type, VDEV_TYPE_MIRROR) != 0) {
+				/*
+				 * TODO: only AnyRAID mirror is expected to be
+				 * allowed.
+				 */
+				if (strcmp(type, VDEV_TYPE_MIRROR) != 0 &&
+				    strcmp(type, VDEV_TYPE_ANYRAID) != 0) {
 					(void) fprintf(stderr,
 					    gettext("invalid vdev "
 					    "specification: unsupported 'log' "

module/os/freebsd/zfs/sysctl_os.c

@@ -93,6 +93,8 @@
 #include <sys/vmmeter.h>
 
 SYSCTL_DECL(_vfs_zfs);
+SYSCTL_NODE(_vfs_zfs, OID_AUTO, anyraid, CTLFLAG_RW, 0,
+	"ZFS AnyRAID VDEV");
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, arc, CTLFLAG_RW, 0,
 	"ZFS adaptive replacement cache");
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, brt, CTLFLAG_RW, 0,
@@ -125,8 +127,6 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, zio, CTLFLAG_RW, 0, "ZFS ZIO");
 
 SYSCTL_NODE(_vfs_zfs_livelist, OID_AUTO, condense, CTLFLAG_RW, 0,
 	"ZFS livelist condense");
-SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, anyraid, CTLFLAG_RW, 0,
-	"ZFS AnyRAID VDEV");
 SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, file, CTLFLAG_RW, 0, "ZFS VDEV file");
 SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0,
 	"ZFS VDEV mirror");

module/zfs/vdev_anyraid.c

@@ -197,9 +197,7 @@ vdev_anyraid_fini(vdev_t *vd)
 	vdev_anyraid_t *var = vd->vdev_tsd;
 	avl_destroy(&var->vd_tile_map);
 
-
 	vdev_anyraid_node_t *node;
-	
 	void *cookie = NULL;
 	while ((node = avl_destroy_nodes(&var->vd_children_tree, &cookie))) {
 		kmem_free(node, sizeof (*node));

tests/runfiles/common.run

@@ -42,7 +42,10 @@ tags = ['functional', 'alloc_class']
 
 [tests/functional/anyraid]
 tests = [ 'anyraid_clean_mirror_001_pos', 'anyraid_clean_mirror_002_pos',
-    'anyraid_clean_mirror_003_pos', 'anyraid_tile_layout', 'anyraid_checkpoint']
+    'anyraid_clean_mirror_003_pos', 'anyraid_tile_layout', 'anyraid_checkpoint',
+    'anyraid_faildisk_write_replace_resilver',
+    'anyraid_offline_write_online_resilver',
+    'anyraid_special_vdev_001_pos', 'anyraid_special_vdev_002_pos']
 tags = ['functional', 'anyraid']
 
 [tests/functional/append]

tests/zfs-tests/include/commands.cfg

@@ -52,7 +52,6 @@ export SYSTEM_FILES_COMMON='awk
     ldd
     ln
     ls
-    md5sum
     mkdir
     mknod
     mkfifo

tests/zfs-tests/tests/Makefile.am

@@ -438,7 +438,11 @@ nobase_dist_datadir_zfs_tests_tests_SCRIPTS += \
 	functional/anyraid/anyraid_clean_mirror_001_pos.ksh \
 	functional/anyraid/anyraid_clean_mirror_002_pos.ksh \
 	functional/anyraid/anyraid_clean_mirror_003_pos.ksh \
+	functional/anyraid/anyraid_faildisk_write_replace_resilver.ksh \
+	functional/anyraid/anyraid_offline_write_online_resilver.ksh \
 	functional/anyraid/anyraid_tile_layout.ksh \
+	functional/anyraid/anyraid_special_vdev_001_pos.ksh \
+	functional/anyraid/anyraid_special_vdev_002_pos.ksh \
 	functional/anyraid/cleanup.ksh \
 	functional/anyraid/setup.ksh \
 	functional/append/file_append.ksh \

tests/zfs-tests/tests/functional/anyraid/anyraid_clean_mirror_001_pos.ksh

@@ -43,11 +43,11 @@ log_assert "AnyRAID mirror1 can survive having 1 failed disk"
 
 log_must create_sparse_files "disk" 3 $DEVSIZE
 
-spec_cases "anyraid1 $disk0 $disk1" \
+clean_mirror_spec_cases "anyraid1 $disk0 $disk1" \
 	"$disk0" \
 	"$disk1"
 
-spec_cases "anyraid1 $disk0 $disk1 $disk2" \
+clean_mirror_spec_cases "anyraid1 $disk0 $disk1 $disk2" \
 	"$disk0" \
 	"$disk1" \
 	"$disk2"

tests/zfs-tests/tests/functional/anyraid/anyraid_clean_mirror_002_pos.ksh

@@ -43,15 +43,15 @@ log_assert "AnyRAID mirror2 can survive having 1-2 failed disks"
 
 log_must create_sparse_files "disk" 4 $DEVSIZE
 
-spec_cases "anyraid2 $disk0 $disk1 $disk2" \
+clean_mirror_spec_cases "anyraid2 $disk0 $disk1 $disk2" \
 	"$disk0" \
 	"$disk1" \
 	"$disk2" \
 	"\"$disk0 $disk1\"" \
 	"\"$disk0 $disk2\"" \
 	"\"$disk1 $disk2\""
 
-spec_cases "anyraid2 $disk0 $disk1 $disk2 $disk3" \
+clean_mirror_spec_cases "anyraid2 $disk0 $disk1 $disk2 $disk3" \
 	"$disk0" \
 	"$disk1" \
 	"$disk2" \

tests/zfs-tests/tests/functional/anyraid/anyraid_clean_mirror_003_pos.ksh

@@ -43,7 +43,7 @@ log_assert "AnyRAID mirror3 can survive having 1-3 failed disks"
 
 log_must create_sparse_files "disk" 4 $DEVSIZE
 
-spec_cases "anyraid3 $disk0 $disk1 $disk2 $disk3" \
+clean_mirror_spec_cases "anyraid3 $disk0 $disk1 $disk2 $disk3" \
 	"$disk0" \
 	"$disk1" \
 	"$disk2" \

tests/zfs-tests/tests/functional/anyraid/anyraid_common.kshlib

@@ -41,7 +41,7 @@ function wipe_some_disks_and_verify_content_is_still_okay
 		files[$atfile]=/$pool/file.$atfile
 		log_must file_write -o create -f ${files[$atfile]} \
 			-b $FILE_SIZE -c 1
-		cksums[$atfile]=$(md5sum ${files[$atfile]})
+		cksums[$atfile]=$(xxh128digest ${files[$atfile]})
 		(( atfile = atfile + 1 ))
 	done
 
@@ -61,7 +61,7 @@ function wipe_some_disks_and_verify_content_is_still_okay
 	atfile=0
 	typeset -i failedcount=0
 	while (( atfile < FILE_COUNT )); do
-		newcksum=$(md5sum ${files[$atfile]})
+		newcksum=$(xxh128digest ${files[$atfile]})
 		if [[ $newcksum != ${cksums[$atfile]} ]]; then
 			(( failedcount = failedcount + 1 ))
 			log_note "Wrong checksum of ${files[$atfile]}"
@@ -80,7 +80,7 @@ function wipe_some_disks_and_verify_content_is_still_okay
 	log_must zpool status
 }
 
-function spec_cases
+function clean_mirror_spec_cases
 {
 	typeset poolspec=$1
 	shift