From 3013a1581961551d829157cb499c5dcf8221d456 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Dec 2021 23:20:10 +0000 Subject: [PATCH] ZTS: rsend_007_pos failures The rsend_007_pos test reliably fails on Linux in the cleanup function. This is caused by an unmount error when attempting to recursively destroy the newly received datasets. Invoking `df` prior to the `zfs destroy` interestingly avoids the unmont error. Why this should matter is unclear and should be investigated. However, this minor tweak may allow us to remove the ZTS rsend exceptions. The subsequent rsend_010_pos and rsend_011_pos failures were a result of this initial failure. The other "maybe" failures I was unable to reproduce and have not been recently observed in the master branch. Reviewed-by: Tony Nguyen Reviewed-by: Ryan Moeller Signed-off-by: Brian Behlendorf Closes #5665 Closes #6086 Closes #6087 Closes #6446 Closes #12876 --- tests/test-runner/bin/zts-report.py.in | 9 --------- tests/zfs-tests/tests/functional/rsend/rsend.kshlib | 1 + 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 7694a7245713..f301481e8bd0 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -242,12 +242,6 @@ maybe = { 'removal/removal_condense_export': ['FAIL', known_reason], 'reservation/reservation_008_pos': ['FAIL', '7741'], 'reservation/reservation_018_pos': ['FAIL', '5642'], - 'rsend/rsend_019_pos': ['FAIL', '6086'], - 'rsend/rsend_020_pos': ['FAIL', '6446'], - 'rsend/rsend_021_pos': ['FAIL', '6446'], - 'rsend/rsend_024_pos': ['FAIL', '5665'], - 'rsend/send-c_volume': ['FAIL', '6087'], - 'rsend/send_partial_dataset': ['FAIL', known_reason], 'snapshot/clone_001_pos': ['FAIL', known_reason], 'snapshot/snapshot_009_pos': ['FAIL', '7961'], 'snapshot/snapshot_010_pos': ['FAIL', '7961'], @@ -292,9 +286,6 @@ elif sys.platform.startswith('linux'): 'mmp/mmp_exported_import': ['FAIL', known_reason], 'mmp/mmp_inactive_import': ['FAIL', known_reason], 'refreserv/refreserv_raidz': ['FAIL', known_reason], - 'rsend/rsend_007_pos': ['FAIL', known_reason], - 'rsend/rsend_010_pos': ['FAIL', known_reason], - 'rsend/rsend_011_pos': ['FAIL', known_reason], 'snapshot/rollback_003_pos': ['FAIL', known_reason], }) diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib index d06bd39b4d49..8cd35e4afdfe 100644 --- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib +++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib @@ -121,6 +121,7 @@ function cleanup_pool log_must rm -rf $BACKDIR/* if is_global_zone ; then + log_must df >/dev/null log_must_busy zfs destroy -Rf $pool else typeset list=$(zfs list -H -r -t all -o name $pool)