c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix reporting of CKSUM errors in indirect vdevs

Browse Source 
When removing and subsequently reattaching a vdev, CKSUM errors may
occur as vdev_indirect_read_all() reads from all children of a mirror
in case of a resilver.

Fix this by checking whether a child is missing the data and setting a
flag (ic_error) which is then checked in vdev_indirect_repair() and
suppresses incrementing the checksum counter.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: George Amanakis <gamanakis@gmail.com>
Closes #11277
This commit is contained in:
George Amanakis
2020-12-11 21:15:37 +01:00
committed by Brian Behlendorf
parent 058b6fd069
commit 900480bd96
4 changed files with 97 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/runfiles/common.run
+1 -1
View File
@@ -756,7 +756,7 @@ tests = ['removal_all_vdev', 'removal_cancel', 'removal_check_space',
'removal_with_send_recv', 'removal_with_snapshot',
'removal_with_write', 'removal_with_zdb', 'remove_expanded',
'remove_mirror', 'remove_mirror_sanity', 'remove_raidz',
'remove_indirect']
'remove_indirect', 'remove_attach_mirror']
tags = ['functional', 'removal']
[tests/functional/rename_dirs]
tests/zfs-tests/tests/functional/removal/Makefile.am
+2 -1
View File
@@ -29,7 +29,8 @@ dist_pkgdata_SCRIPTS = \
removal_with_send.ksh removal_with_send_recv.ksh \
removal_with_snapshot.ksh removal_with_write.ksh \
removal_with_zdb.ksh remove_mirror.ksh remove_mirror_sanity.ksh \
remove_raidz.ksh remove_expanded.ksh remove_indirect.ksh
remove_raidz.ksh remove_expanded.ksh remove_indirect.ksh \
remove_attach_mirror.ksh
dist_pkgdata_DATA = \
removal.kshlib
tests/zfs-tests/tests/functional/removal/remove_attach_mirror.ksh
Executable
+73
View File
@@ -0,0 +1,73 @@
#! /bin/ksh -p
#
# CDDL HEADER START
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
# CDDL HEADER END
#
#
# Copyright (c) 2020, George Amanakis. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/removal/removal.kshlib
#
# DESCRIPTION:
# Resilvering results in no CKSUM errors in pools with indirect vdevs.
#
# STRATEGY:
# 1. Create a pool with two top-vdevs
# 2. Write some files
# 3. Remove one of the top-vdevs
# 4. Reattach it to make a mirror
#
TMPDIR=${TMPDIR:-$TEST_BASE_DIR}
DISK1="$TMPDIR/dsk1"
DISK2="$TMPDIR/dsk2"
DISKS="$DISK1 $DISK2"
# fio options
export DIRECTORY=/$TESTPOOL
export NUMJOBS=16
export RUNTIME=10
export PERF_RANDSEED=1234
export PERF_COMPPERCENT=66
export PERF_COMPCHUNK=0
export BLOCKSIZE=4K
export SYNC_TYPE=0
export DIRECT=1
export FILE_SIZE=128M
log_must mkfile 4g $DISK1
log_must mkfile 4g $DISK2
function cleanup
{
default_cleanup_noexit
log_must rm -f $DISKS
}
log_must zpool create -O recordsize=4k $TESTPOOL $DISK1 $DISK2
log_onexit cleanup
log_must fio $FIO_SCRIPTS/mkfiles.fio
log_must fio $FIO_SCRIPTS/sequential_reads.fio
log_must zpool remove -w $TESTPOOL $DISK2
log_must zpool attach -w $TESTPOOL $DISK1 $DISK2
verify_pool $TESTPOOL
log_pass "Resilvering results in no CKSUM errors with indirect vdevs"