yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zfstest: improve reset behaviour

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2017-05-17 11:42:31 +02:00
committed by Wolfgang Bumiller
parent 078c28aac6
commit b13cf56109
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/run_test_zfspoolplugin.pl
View File

@ -2613,11 +2613,20 @@ sub setup_zfs {
sub cleanup_zfs { sub cleanup_zfs {
print "destroy $pool\/$subvol\n" if $verbose; print "destroy $pool\/$subvol\n" if $verbose;
run_command("zfs destroy $zpath -r"); eval { run_command("zfs destroy $zpath -r"); };
if ($@) {
print "cleanup failed: $@\nretrying once\n" if $verbose;
eval { run_command("zfs destroy $zpath -r"); };
if ($@) {
clean_up_zpool();
setup_zpool();
}
}
} }
sub setup_zpool { sub setup_zpool {
unlink 'zpool.img';
eval { eval {
run_command("dd if=/dev/zero of=zpool.img bs=1M count=8000 "); run_command("dd if=/dev/zero of=zpool.img bs=1M count=8000 ");
}; };