From patchwork Tue Nov 25 10:21:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoguang Wang X-Patchwork-Id: 5374861 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF8139FD49 for ; Tue, 25 Nov 2014 10:24:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D4E6A201C7 for ; Tue, 25 Nov 2014 10:24:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E993201CE for ; Tue, 25 Nov 2014 10:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752118AbaKYKYr (ORCPT ); Tue, 25 Nov 2014 05:24:47 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:51251 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751077AbaKYKYo (ORCPT ); Tue, 25 Nov 2014 05:24:44 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="43945742" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 25 Nov 2014 18:21:22 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id sAPAOJhW003118; Tue, 25 Nov 2014 18:24:19 +0800 Received: from localhost.localdomain (10.167.226.24) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Tue, 25 Nov 2014 18:24:38 +0800 From: Xiaoguang Wang To: , CC: Xiaoguang Wang Subject: [PATCH] ext4/004: add dump/restore test Date: Tue, 25 Nov 2014 18:21:09 +0800 Message-ID: <1416910869-28538-1-git-send-email-wangxg.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.2.1 MIME-Version: 1.0 X-Originating-IP: [10.167.226.24] Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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