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

Pool allocation classes misplacing small file blocks

Browse Source 
Due to an off-by-one condition in spa_preferred_class() we are picking
the "normal" allocation class instead of the "special" one for file
blocks with size equal to the special_small_blocks property value.

This change fix the small code issue, update the ZFS Test Suite and the
zfs(8) man page.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Don Brady <don.brady@delphix.com>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #8351
Closes #8361
This commit is contained in:
loli10K
2019-02-08 21:32:12 +01:00
committed by Matthew Ahrens
parent 0902c4577f
commit 4417096956
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/alloc_class/alloc_class_012_pos.ksh
+41
View File
@@ -24,6 +24,39 @@
verify_runnable "global"
#
# Verify the file identified by the input <inode> is written on a special vdev
# According to the pool layout used in this test vdev_id 3 and 4 are special
# XXX: move this function to libtest.shlib once we get "Vdev Properties"
#
function file_in_special_vdev # <dataset> <inode>
{
typeset dataset="$1"
typeset inum="$2"
zdb -dddddd $dataset $inum | awk '{
# find DVAs from string "offset level dva" only for L0 (data) blocks
if (match($0,"L0 [0-9]+")) {
dvas[0]=$3
dvas[1]=$4
dvas[2]=$5
for (i = 0; i < 3; ++i) {
if (match(dvas[i],"([^:]+):.*")) {
dva = substr(dvas[i], RSTART, RLENGTH);
# parse DVA from string "vdev:offset:asize"
if (split(dva,arr,":") != 3) {
print "Error parsing DVA: <" dva ">";
exit 1;
}
# verify vdev is "special"
if (arr[1] < 3) {
exit 1;
}
}
}
}}'
}
claim="Removing a special device from a pool succeeds."
log_assert $claim
@@ -53,6 +86,13 @@ done
log_must sync_pool $TESTPOOL
log_must zpool list -v $TESTPOOL
# Verify the files were written in the special class vdevs
for i in 1 2 3 4; do
dataset="$TESTPOOL/$TESTFS"
inum="$(stat -c '%i' /$TESTPOOL/$TESTFS/testfile.$i)"
log_must file_in_special_vdev $dataset $inum
done
#
# remove a special allocation vdev and force a remapping
# N.B. The 'zfs remap' command has been disabled and may be removed.
@@ -67,6 +107,7 @@ log_must sync_pool $TESTPOOL
sleep 1
log_must zdb -bbcc $TESTPOOL
log_must zpool list -v $TESTPOOL
log_must zpool destroy -f "$TESTPOOL"
log_pass $claim