From patchwork Fri Dec 5 07:16:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoguang Wang X-Patchwork-Id: 5442401 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 324B79F30B for ; Fri, 5 Dec 2014 07:20:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 29B852035D for ; Fri, 5 Dec 2014 07:20:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28B0E20121 for ; Fri, 5 Dec 2014 07:20:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751590AbaLEHU2 (ORCPT ); Fri, 5 Dec 2014 02:20:28 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:39045 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751562AbaLEHU2 (ORCPT ); Fri, 5 Dec 2014 02:20:28 -0500 X-IronPort-AV: E=Sophos;i="5.04,848,1406563200"; d="scan'208";a="44549486" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 05 Dec 2014 15:17:07 +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 sB57K4r0027359; Fri, 5 Dec 2014 15:20:04 +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; Fri, 5 Dec 2014 15:20:29 +0800 From: Xiaoguang Wang To: , CC: Xiaoguang Wang Subject: [PATCH v3] ext4: add dump/restore test Date: Fri, 5 Dec 2014 15:16:51 +0800 Message-ID: <1417763811-5986-1-git-send-email-wangxg.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <20141204072959.GD29912@dhcp-13-216.nay.redhat.com> References: <20141204072959.GD29912@dhcp-13-216.nay.redhat.com> 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 ++ 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..b24b627 --- /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.* + # remove the generated data, which is much and meaningless. + rm -rf $restore_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() +{ + echo "Run fsstress" >> $seqres.full + 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 + 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 $restore_dir $TEST_DIR/restoresymtable + +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