diff options
| -rwxr-xr-x | tests/test-runner/bin/zts-report.py.in | 1 | ||||
| -rw-r--r-- | tests/zfs-tests/tests/functional/rsend/rsend.kshlib | 7 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh | 17 |
3 files changed, 17 insertions, 8 deletions
diff --git a/tests/test-runner/bin/zts-report.py.in b/tests/test-runner/bin/zts-report.py.in index 414e26656..d306e0476 100755 --- a/tests/test-runner/bin/zts-report.py.in +++ b/tests/test-runner/bin/zts-report.py.in @@ -294,7 +294,6 @@ elif sys.platform.startswith('linux'): 'mmp/mmp_active_import': ['FAIL', known_reason], 'mmp/mmp_exported_import': ['FAIL', known_reason], 'mmp/mmp_inactive_import': ['FAIL', known_reason], - 'snapshot/rollback_003_pos': ['FAIL', known_reason], 'zvol/zvol_misc/zvol_misc_snapdev': ['FAIL', '12621'], 'zvol/zvol_misc/zvol_misc_volmode': ['FAIL', known_reason], }) diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib index 8cd35e4af..516d41263 100644 --- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib +++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib @@ -121,6 +121,13 @@ function cleanup_pool log_must rm -rf $BACKDIR/* if is_global_zone ; then + # + # Linux: Issuing a `df` seems to properly force any negative + # dcache entries to be invalidated preventing failures when + # accessing the mount point. Additional investigation required. + # + # https://github.com/openzfs/zfs/issues/6143 + # log_must df >/dev/null log_must_busy zfs destroy -Rf $pool else diff --git a/tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh b/tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh index 59e7c110d..036e71410 100755 --- a/tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapshot/rollback_003_pos.ksh @@ -92,6 +92,15 @@ log_note "Verify rollback of multiple nested file systems succeeds." log_must zfs snapshot $TESTPOOL/$TESTFILE@$TESTSNAP log_must zfs snapshot $SNAPPOOL.1 +# +# Linux: Issuing a `df` seems to properly force any negative dcache entries to +# be invalidated preventing failures when accessing the mount point. Additional +# investigation required. +# +# https://github.com/openzfs/zfs/issues/6143 +# +log_must df >/dev/null + export __ZFS_POOL_RESTRICT="$TESTPOOL" log_must zfs unmount -a log_must zfs mount -a @@ -100,12 +109,6 @@ unset __ZFS_POOL_RESTRICT log_must touch /$TESTPOOL/$TESTFILE/$TESTFILE.1 log_must zfs rollback $SNAPPOOL.1 - -# -# Workaround for issue #6143. Issuing a `df` seems to properly force any -# negative dcache entries to be invalidated preventing subsequent failures -# when accessing the mount point. Additional investigation required. -# -log_must df +log_must df >/dev/null log_pass "Rollbacks succeed when nested file systems are present." |