All of lore.kernel.org
 help / color / mirror / Atom feed
From: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
To: fstests@vger.kernel.org, linux-ext4@vger.kernel.org
Cc: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
Subject: [PATCH] ext4/004: add dump/restore test
Date: Tue, 25 Nov 2014 18:21:09 +0800	[thread overview]
Message-ID: <1416910869-28538-1-git-send-email-wangxg.fnst@cn.fujitsu.com> (raw)

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.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 common/config      |   2 ++
 common/rc          |   7 ++++
 tests/ext4/004     | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/ext4/004.out |   7 ++++
 tests/ext4/group   |   3 +-
 5 files changed, 122 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..8ea70ec 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 E2FS_DUMP_PROG="`set_prog_path dump`"
+export E2FS_RESTORE_PROG="`set_prog_path restore`"
 
 # Generate a comparable xfsprogs version number in the form of
 # major * 10000 + minor * 100 + release
diff --git a/common/rc b/common/rc
index d5e3aff..ef7939d 100644
--- a/common/rc
+++ b/common/rc
@@ -2258,6 +2258,13 @@ _require_fio()
 	[ $? -eq 0 ] || _notrun "$FIO_PROG too old, see $seqres.full"
 }
 
+# Check that dump/restore is present
+_require_dump_restore()
+{
+	_require_command $E2FS_DUMP_PROG "dump"
+	_require_command $E2FS_RESTORE_PROG "restore"
+}
+
 # Does freeze work on this fs?
 _require_freeze()
 {
diff --git a/tests/ext4/004 b/tests/ext4/004
new file mode 100755
index 0000000..cbf35e5
--- /dev/null
+++ b/tests/ext4/004
@@ -0,0 +1,104 @@
+#! /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 $restore_dir
+	rm -rf $dump_dir
+	_scratch_unmount
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+dump_dir=$SCRATCH_MNT/dump_restore_dir
+restore_dir=$TEST_DIR/dump_restore_dir
+
+_diff_compare()
+{
+	echo "Comparing dump directory with restore directory"
+	diff -rs $dump_dir $restore_dir >> $seqres.full 2>&1
+	if [ $? -ne 0 ];then
+		echo "Dump/Restore compare failed"
+		exit
+	fi
+	echo "Dump/Restore compare success"
+}
+
+_workout()
+{
+	echo ""
+	echo "Run fsstress"
+	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"
+	cd $TEST_DIR
+
+	$E2FS_DUMP_PROG	-0 -f - $dump_dir 2>/dev/null | $E2FS_RESTORE_PROG -urvf - >> $seqres.full 2>&1
+	if [ $? -ne 0 ];then
+		echo "Dump/Restore failed"
+		exit
+	else
+		echo "Dump/Restore success"
+	fi
+
+	rm -rf restoresymtable
+	_diff_compare
+}
+
+# real QA test starts here
+_supported_fs ext4
+_supported_os Linux
+
+_require_scratch
+_require_dump_restore
+
+rm -f $seqres.full
+
+_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
+_scratch_mount || _fail "couldn't mount fs"
+
+umount $TEST_DEV
+_test_mkfs >> $seqres.full 2>&1
+_test_mount
+
+_workout
+
+status=0
+exit
diff --git a/tests/ext4/004.out b/tests/ext4/004.out
new file mode 100644
index 0000000..c9b125a
--- /dev/null
+++ b/tests/ext4/004.out
@@ -0,0 +1,7 @@
+QA output created by 004
+
+Run fsstress
+start Dump/Restore
+Dump/Restore success
+Comparing dump directory with restore directory
+Dump/Restore compare success
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.2.1


WARNING: multiple messages have this Message-ID (diff)
From: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
To: <fstests@vger.kernel.org>, <linux-ext4@vger.kernel.org>
Cc: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
Subject: [PATCH] ext4/004: add dump/restore test
Date: Tue, 25 Nov 2014 18:21:09 +0800	[thread overview]
Message-ID: <1416910869-28538-1-git-send-email-wangxg.fnst@cn.fujitsu.com> (raw)

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.

Signed-off-by: Xiaoguang Wang <wangxg.fnst@cn.fujitsu.com>
---
 common/config      |   2 ++
 common/rc          |   7 ++++
 tests/ext4/004     | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/ext4/004.out |   7 ++++
 tests/ext4/group   |   3 +-
 5 files changed, 122 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..8ea70ec 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 E2FS_DUMP_PROG="`set_prog_path dump`"
+export E2FS_RESTORE_PROG="`set_prog_path restore`"
 
 # Generate a comparable xfsprogs version number in the form of
 # major * 10000 + minor * 100 + release
diff --git a/common/rc b/common/rc
index d5e3aff..ef7939d 100644
--- a/common/rc
+++ b/common/rc
@@ -2258,6 +2258,13 @@ _require_fio()
 	[ $? -eq 0 ] || _notrun "$FIO_PROG too old, see $seqres.full"
 }
 
+# Check that dump/restore is present
+_require_dump_restore()
+{
+	_require_command $E2FS_DUMP_PROG "dump"
+	_require_command $E2FS_RESTORE_PROG "restore"
+}
+
 # Does freeze work on this fs?
 _require_freeze()
 {
diff --git a/tests/ext4/004 b/tests/ext4/004
new file mode 100755
index 0000000..cbf35e5
--- /dev/null
+++ b/tests/ext4/004
@@ -0,0 +1,104 @@
+#! /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 $restore_dir
+	rm -rf $dump_dir
+	_scratch_unmount
+}
+
+# get standard environment, filters and checks
+. ./common/rc
+. ./common/filter
+
+dump_dir=$SCRATCH_MNT/dump_restore_dir
+restore_dir=$TEST_DIR/dump_restore_dir
+
+_diff_compare()
+{
+	echo "Comparing dump directory with restore directory"
+	diff -rs $dump_dir $restore_dir >> $seqres.full 2>&1
+	if [ $? -ne 0 ];then
+		echo "Dump/Restore compare failed"
+		exit
+	fi
+	echo "Dump/Restore compare success"
+}
+
+_workout()
+{
+	echo ""
+	echo "Run fsstress"
+	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"
+	cd $TEST_DIR
+
+	$E2FS_DUMP_PROG	-0 -f - $dump_dir 2>/dev/null | $E2FS_RESTORE_PROG -urvf - >> $seqres.full 2>&1
+	if [ $? -ne 0 ];then
+		echo "Dump/Restore failed"
+		exit
+	else
+		echo "Dump/Restore success"
+	fi
+
+	rm -rf restoresymtable
+	_diff_compare
+}
+
+# real QA test starts here
+_supported_fs ext4
+_supported_os Linux
+
+_require_scratch
+_require_dump_restore
+
+rm -f $seqres.full
+
+_scratch_mkfs_sized $((512 * 1024 * 1024)) >> $seqres.full 2>&1
+_scratch_mount || _fail "couldn't mount fs"
+
+umount $TEST_DEV
+_test_mkfs >> $seqres.full 2>&1
+_test_mount
+
+_workout
+
+status=0
+exit
diff --git a/tests/ext4/004.out b/tests/ext4/004.out
new file mode 100644
index 0000000..c9b125a
--- /dev/null
+++ b/tests/ext4/004.out
@@ -0,0 +1,7 @@
+QA output created by 004
+
+Run fsstress
+start Dump/Restore
+Dump/Restore success
+Comparing dump directory with restore directory
+Dump/Restore compare success
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.2.1


             reply	other threads:[~2014-11-25 10:24 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-25 10:21 Xiaoguang Wang [this message]
2014-11-25 10:21 ` [PATCH] ext4/004: add dump/restore test Xiaoguang Wang
2014-12-01  5:45 ` Dave Chinner
2014-12-03  2:44   ` Xiaoguang Wang
2014-12-03  2:44     ` Xiaoguang Wang
2014-12-03  6:40     ` [PATCH v2] " Xiaoguang Wang
2014-12-03  6:40       ` Xiaoguang Wang
2014-12-03  7:49       ` Eryu Guan
2014-12-03  9:47         ` Xiaoguang Wang
2014-12-03  9:47           ` Xiaoguang Wang
2014-12-04  7:29           ` Eryu Guan
2014-12-05  7:16             ` [PATCH v3] ext4: " Xiaoguang Wang
2014-12-05  7:16               ` Xiaoguang Wang
2014-12-06 21:40 ` [PATCH] ext4/004: " Theodore Ts'o
2014-12-06 23:44   ` Dave Chinner
2014-12-08  1:44   ` Xiaoguang Wang
2014-12-08  1:44     ` Xiaoguang Wang
2014-12-16  2:58     ` Theodore Ts'o
2014-12-16  3:59       ` Dave Chinner
2014-12-16 15:53         ` Theodore Ts'o
2014-12-16 19:36           ` Dave Chinner
2014-12-17  5:16       ` Xiaoguang Wang
2014-12-17  5:16         ` Xiaoguang Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1416910869-28538-1-git-send-email-wangxg.fnst@cn.fujitsu.com \
    --to=wangxg.fnst@cn.fujitsu.com \
    --cc=fstests@vger.kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.