Print this page
7290 ZFS test suite needs to control what utilities it can run
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
*** 24,34 ****
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
! # Copyright (c) 2013 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/snapshot/snapshot.cfg
--- 24,34 ----
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
#
! # Copyright (c) 2013, 2016 by Delphix. All rights reserved.
#
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/snapshot/snapshot.cfg
*** 50,113 ****
verify_runnable "both"
function cleanup
{
snapexists $SNAPPOOL && \
! log_must $ZFS destroy -r $SNAPPOOL
[[ -e $TESTDIR ]] && \
! log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
}
log_assert "Verify that rollback to a snapshot created by snapshot -r succeeds."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
! log_must $RM -rf $TESTDIR/* > /dev/null 2>&1
typeset -i COUNT=10
log_note "Populate the $TESTDIR directory (prior to snapshot)"
typeset -i i=0
while (( i < COUNT )); do
! log_must $FILE_WRITE -o create -f $TESTDIR/before_file$i \
-b $BLOCKSZ -c $NUM_WRITES -d $i
(( i = i + 1 ))
done
! log_must $ZFS snapshot -r $SNAPPOOL
! FILE_COUNT=`$LS -Al $SNAPDIR | $GREP -v "total" | wc -l`
if (( FILE_COUNT != COUNT )); then
! $LS -Al $SNAPDIR
log_fail "AFTER: $SNAPFS contains $FILE_COUNT files(s)."
fi
log_note "Populate the $TESTDIR directory (post snapshot)"
typeset -i i=0
while (( i < COUNT )); do
! log_must $FILE_WRITE -o create -f $TESTDIR/after_file$i \
-b $BLOCKSZ -c $NUM_WRITES -d $i
(( i = i + 1 ))
done
#
# Now rollback to latest snapshot
#
! log_must $ZFS rollback $SNAPFS
! FILE_COUNT=`$LS -Al $TESTDIR/after* 2> /dev/null | $GREP -v "total" | wc -l`
if (( FILE_COUNT != 0 )); then
! $LS -Al $TESTDIR
log_fail "$TESTDIR contains $FILE_COUNT after* files(s)."
fi
! FILE_COUNT=`$LS -Al $TESTDIR/before* 2> /dev/null \
! | $GREP -v "total" | wc -l`
if (( FILE_COUNT != $COUNT )); then
! $LS -Al $TESTDIR
log_fail "$TESTDIR contains $FILE_COUNT before* files(s)."
fi
log_pass "Rollback with child snapshot works as expected."
--- 50,113 ----
verify_runnable "both"
function cleanup
{
snapexists $SNAPPOOL && \
! log_must zfs destroy -r $SNAPPOOL
[[ -e $TESTDIR ]] && \
! log_must rm -rf $TESTDIR/* > /dev/null 2>&1
}
log_assert "Verify that rollback to a snapshot created by snapshot -r succeeds."
log_onexit cleanup
[[ -n $TESTDIR ]] && \
! log_must rm -rf $TESTDIR/* > /dev/null 2>&1
typeset -i COUNT=10
log_note "Populate the $TESTDIR directory (prior to snapshot)"
typeset -i i=0
while (( i < COUNT )); do
! log_must file_write -o create -f $TESTDIR/before_file$i \
-b $BLOCKSZ -c $NUM_WRITES -d $i
(( i = i + 1 ))
done
! log_must zfs snapshot -r $SNAPPOOL
! FILE_COUNT=`ls -Al $SNAPDIR | grep -v "total" | wc -l`
if (( FILE_COUNT != COUNT )); then
! ls -Al $SNAPDIR
log_fail "AFTER: $SNAPFS contains $FILE_COUNT files(s)."
fi
log_note "Populate the $TESTDIR directory (post snapshot)"
typeset -i i=0
while (( i < COUNT )); do
! log_must file_write -o create -f $TESTDIR/after_file$i \
-b $BLOCKSZ -c $NUM_WRITES -d $i
(( i = i + 1 ))
done
#
# Now rollback to latest snapshot
#
! log_must zfs rollback $SNAPFS
! FILE_COUNT=`ls -Al $TESTDIR/after* 2> /dev/null | grep -v "total" | wc -l`
if (( FILE_COUNT != 0 )); then
! ls -Al $TESTDIR
log_fail "$TESTDIR contains $FILE_COUNT after* files(s)."
fi
! FILE_COUNT=`ls -Al $TESTDIR/before* 2> /dev/null \
! | grep -v "total" | wc -l`
if (( FILE_COUNT != $COUNT )); then
! ls -Al $TESTDIR
log_fail "$TESTDIR contains $FILE_COUNT before* files(s)."
fi
log_pass "Rollback with child snapshot works as expected."