Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Fix ztest deadman panic with indirect vdev damage 

This patch fixes an issue where ztest's deadman thread would
trigger a panic because reconstructing artifically damaged
blocks would take too long to reconstruct. This patch simply
limits how often ztest inflicts split-block damage and how
many segments it can damage when it does.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Serapheim Dimitropoulos <serapheim.dimitro@delphix.com>
Reviewed-by: Matthew Ahrens <mahrens@delphix.com>
Signed-off-by: Tom Caputi <tcaputi@datto.com>
Closes #8010
This commit is contained in:
Tom Caputi 2018-10-18 16:53:27 -04:00 committed by Brian Behlendorf
parent 5e0bd0ae05
commit 4a7eb69a5a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ztest/ztest.c
View File

@ -7383,8 +7383,13 @@ main(int argc, char **argv)
* Verify that even extensively damaged split blocks with many * Verify that even extensively damaged split blocks with many
* segments can be reconstructed in a reasonable amount of time * segments can be reconstructed in a reasonable amount of time
* when reconstruction is known to be possible. * when reconstruction is known to be possible.
*
* Note: the lower this value is, the more damage we inflict, and
* the more time ztest spends in recovering that damage. We chose
* to induce damage 1/100th of the time so recovery is tested but
* not so frequently that ztest doesn't get to test other code paths.
*/ */
zfs_reconstruct_indirect_damage_fraction = 4; zfs_reconstruct_indirect_damage_fraction = 100;
action.sa_handler = sig_handler; action.sa_handler = sig_handler;
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);

6
module/zfs/vdev_indirect.c
View File

@ -1614,7 +1614,7 @@ vdev_indirect_splits_damage(indirect_vsd_t *iv, zio_t *zio)
* result in two or less unique copies per indirect_child_t. * result in two or less unique copies per indirect_child_t.
* Both may need to be checked in order to reconstruct the block. * Both may need to be checked in order to reconstruct the block.
* Set iv->iv_attempts_max such that all unique combinations will * Set iv->iv_attempts_max such that all unique combinations will
* enumerated, but limit the damage to at most 16 indirect splits. * enumerated, but limit the damage to at most 12 indirect splits.
*/ */
iv->iv_attempts_max = 1; iv->iv_attempts_max = 1;
@ -1632,7 +1632,7 @@ vdev_indirect_splits_damage(indirect_vsd_t *iv, zio_t *zio)
} }
iv->iv_attempts_max *= 2; iv->iv_attempts_max *= 2;
if (iv->iv_attempts_max > (1ULL << 16)) { if (iv->iv_attempts_max >= (1ULL << 12)) {
iv->iv_attempts_max = UINT64_MAX; iv->iv_attempts_max = UINT64_MAX;
break; break;
} }
@ -1718,7 +1718,7 @@ vdev_indirect_reconstruct_io_done(zio_t *zio)
/* /*
* If nonzero, every 1/x blocks will be damaged, in order to validate * If nonzero, every 1/x blocks will be damaged, in order to validate
* reconstruction when there are split segments with damaged copies. * reconstruction when there are split segments with damaged copies.
* Known_good will TRUE when reconstruction is known to be possible. * Known_good will be TRUE when reconstruction is known to be possible.
*/ */
if (zfs_reconstruct_indirect_damage_fraction != 0 && if (zfs_reconstruct_indirect_damage_fraction != 0 &&
spa_get_random(zfs_reconstruct_indirect_damage_fraction) == 0) spa_get_random(zfs_reconstruct_indirect_damage_fraction) == 0)