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

ZTS: Only use ext4 on Linux 

And while here, add a workaround for FreeBSD to ensure dirty data is
synced before taking a snapshot, by remounting read-only, then remount
again read-write after the snapshot.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #9914
This commit is contained in:
Ryan Moeller 2020-01-31 12:00:47 -05:00 committed by GitHub
parent fe7c15985b
commit 591505dc27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/zfs-tests/tests/functional/rsend/send-wDR_encrypted_zvol.ksh
View File

@ -37,8 +37,8 @@ verify_runnable "both"
function cleanup
{
ismounted $recvmnt ext4 && log_must umount $recvmnt
ismounted $mntpnt ext4 && log_must umount $mntpnt
ismounted $recvmnt $fstype && log_must umount $recvmnt
ismounted $mntpnt $fstype && log_must umount $mntpnt
[[ -d $recvmnt ]] && log_must rm -rf $keyfile
[[ -d $mntpnt ]] && log_must rm -rf $keyfile
destroy_dataset $TESTPOOL/recv "-r"
@ -57,6 +57,7 @@ typeset mntpnt=$TESTDIR/$TESTVOL
typeset recvdev=$ZVOL_DEVDIR/$TESTPOOL/recv
typeset recvmnt=$TESTDIR/recvmnt
typeset sendfile=$TESTDIR/sendfile
typeset fstype=none
log_must eval "echo 'password' > $keyfile"
@ -67,8 +68,14 @@ block_device_wait
if is_linux; then
# ext4 only supported on Linux
log_must new_fs -t ext4 $zdev
fstype=ext4
typeset remount_ro="-o remount,ro"
typeset remount_rw="-o remount,rw"
else
log_must new_fs $zdev
fstype=$NEWFS_DEFAULT_FS
typeset remount_ro="-ur"
typeset remount_rw="-uw"
fi
log_must mkdir -p $mntpnt
log_must mkdir -p $recvmnt
@ -81,7 +88,9 @@ for ((i = 1; i <= $snap_count; i++)); do
done
log_must sync
log_must mount $remount_ro $zdev $mntpnt
log_must zfs snap $TESTPOOL/$TESTVOL@snap$i
log_must mount $remount_rw $zdev $mntpnt
done
log_must eval "zfs send -wDR $TESTPOOL/$TESTVOL@snap$snap_count > $sendfile"