Hi,
Thanks for reviewing, and I have one question below, please have a check :)
On 12/03/2014 03:49 PM, Eryu Guan wrote:
> On Wed, Dec 03, 2014 at 02:40:59PM +0800, Xiaoguang Wang wrote:
>> This test case will first use fsstress to fill a file system, then
>> dump it to standard output and restore it from standard input, finally
>> check that the original contents and the new contents generated by
>> restore tool will be same.
>
> For the subject "[PATCH v2] ext4/004: add dump/restore test"
>
> The seq number can be skipped for new test.
OK, will remove it.
>
>>
>> Signed-off-by: Xiaoguang Wang <wangxg.fnst@xxxxxxxxxxxxxx>
>> ---
>> common/config | 2 ++
>> tests/ext4/004 | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> tests/ext4/004.out | 2 ++
>> tests/ext4/group | 3 +-
>> 4 files changed, 95 insertions(+), 1 deletion(-)
>> create mode 100755 tests/ext4/004
>> create mode 100644 tests/ext4/004.out
>>
>> diff --git a/common/config b/common/config
>> index 1cb08c0..e9971fd 100644
>> --- a/common/config
>> +++ b/common/config
>> @@ -188,6 +188,8 @@ export LOGGER_PROG="`set_prog_path logger`"
>> export DBENCH_PROG="`set_prog_path dbench`"
>> export DMSETUP_PROG="`set_prog_path dmsetup`"
>> export WIPEFS_PROG="`set_prog_path wipefs`"
>> +export DUMP_PROG="`set_prog_path dump`"
>> +export RESTORE_PROG="`set_prog_path restore`"
>>
>> # Generate a comparable xfsprogs version number in the form of
>> # major * 10000 + minor * 100 + release
>> diff --git a/tests/ext4/004 b/tests/ext4/004
>> new file mode 100755
>> index 0000000..00262dc
>> --- /dev/null
>> +++ b/tests/ext4/004
>> @@ -0,0 +1,89 @@
>> +#! /bin/bash
>> +# FSQA Test No. 004
>> +#
>> +# Test "dump | restore"(as opposed to a tape)
>> +#
>> +#-----------------------------------------------------------------------
>> +# Copyright (c) 2014 Fujitsu. All Rights Reserved.
>> +#
>> +# This program is free software; you can redistribute it and/or
>> +# modify it under the terms of the GNU General Public License as
>> +# published by the Free Software Foundation.
>> +#
>> +# This program is distributed in the hope that it would be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program; if not, write the Free Software Foundation,
>> +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>> +#
>> +#-----------------------------------------------------------------------
>> +#
>> +
>> +seq=`basename $0`
>> +seqres=$RESULT_DIR/$seq
>> +echo "QA output created by $seq"
>> +
>> +here=`pwd`
>> +tmp=/tmp/$$
>> +status=1 # failure is the default!
>> +trap "_cleanup; exit \$status" 0 1 2 3 15
>> +
>> +_cleanup()
>> +{
>> + cd /
>> + rm -f $tmp.*
>> + rm -rf $restoredir
>> + rm -rf $dumpdir
>
> $restoredir should be rm'ed before running the test, as part of test
> setup not cleanup, as Dave pointed out.
I wonder why we should not rm $restoredir, in which there will be much
data generated by restore, and these data are meaningless ?
>
> $dumpdir doesn't need cleanup, scratch dev will be recreated in next
> test run, Dave pointed this out too.
OK, sorry for missing this.
>
> Also the var names should be "$restore_dir" and "$dump_dir"
>
>> +}
>> +
>> +# get standard environment, filters and checks
>> +. ./common/rc
>> +. ./common/filter
>> +
>> +dump_dir=$SCRATCH_MNT/dump_restore_dir
>> +restore_dir=$TEST_DIR/dump_restore_dir
>> +
>> +_workout()
>
> Local function doesn't need "_" prefix
OK.
>
>> +{
>> + echo "Run fsstress" >> $seqres.full 2>&1
>
> 2>&1 of an echo seems useless to me
>
>> + args=`_scale_fsstress_args -z -f creat=5 -f write=20 -f mkdir=5 -n 1000 -p 15 -d $dump_dir`
>> + echo "fsstress $args" >> $seqres.full
>> +
>> + $FSSTRESS_PROG $args >> $seqres.full 2>&1
>> +
>> + echo "start Dump/Restore" >> $seqres.full 2>&1
>
> here too
>
>> + cd $TEST_DIR
>> +
>> + $DUMP_PROG -0 -f - $dump_dir 2>/dev/null | $RESTORE_PROG -urvf - >> $seqres.full 2>&1
>> + if [ $? -ne 0 ];then
>> + _fail "Dump/Restore failed"
>> + fi
>> +
>> + rm -rf restoresymtable
>> +}
>> +
>> +# real QA test starts here
>> +_supported_fs ext4
>> +_supported_os Linux
>> +
>> +_require_test
>> +_require_scratch
>> +
>> +_require_command $DUMP_PROG
>> +_require_command $RESTORE_PROG
>> +
>> +rm -f $seqres.full
>> +echo "Silence is golden"
>> +
>> +_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
>> +_scratch_mount
>> +rm -rf $TEST_DIR/*
>
> Just remove $restore_dir and restoresymtable, not other files, test
> dev is supposed to be aged.
OK, i see, thanks.
I'll send a V3 later.
Regards,
Xiaoguang Wang
>
> Thanks,
> Eryu
>
>> +
>> +_workout
>> +diff -r $dump_dir $restore_dir
>> +
>> +status=0
>> +exit
>> diff --git a/tests/ext4/004.out b/tests/ext4/004.out
>> new file mode 100644
>> index 0000000..af8614a
>> --- /dev/null
>> +++ b/tests/ext4/004.out
>> @@ -0,0 +1,2 @@
>> +QA output created by 004
>> +Silence is golden
>> diff --git a/tests/ext4/group b/tests/ext4/group
>> index aa6a53b..e7f1f2a 100644
>> --- a/tests/ext4/group
>> +++ b/tests/ext4/group
>> @@ -6,6 +6,7 @@
>> 001 auto prealloc quick
>> 002 auto quick prealloc
>> 003 auto quick
>> +004 auto dump
>> 271 auto rw quick
>> 301 aio dangerous ioctl rw stress
>> 302 aio dangerous ioctl rw stress
>> @@ -14,4 +15,4 @@
>> 305 auto
>> 306 auto rw resize quick
>> 307 auto ioctl rw
>> -308 auto ioctl rw prealloc quick
>> \ No newline at end of file
>> +308 auto ioctl rw prealloc quick
>> --
>> 1.8.3.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe fstests" in
>> the body of a message to majordomo@xxxxxxxxxxxxxxx
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> .
>
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
