From patchwork Fri Jan 27 18:05:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lakshmipathi.G" X-Patchwork-Id: 9542465 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 049AB601D7 for ; Fri, 27 Jan 2017 18:12:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB01B27F54 for ; Fri, 27 Jan 2017 18:12:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFCBF28113; Fri, 27 Jan 2017 18:12:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_WEB autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2AA8727F54 for ; Fri, 27 Jan 2017 18:12:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754013AbdA0SH3 (ORCPT ); Fri, 27 Jan 2017 13:07:29 -0500 Received: from p3nlsmtpcp01-03.prod.phx3.secureserver.net ([184.168.200.142]:54592 "EHLO p3nlsmtpcp01-03.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbdA0SHA (ORCPT ); Fri, 27 Jan 2017 13:07:00 -0500 Received: from p3plcpnl0639.prod.phx3.secureserver.net ([50.62.176.166]) by : HOSTING RELAY : with SMTP id XAtXc4hwdQTQJXAtXcMCzV; Fri, 27 Jan 2017 11:05:07 -0700 Received: from [117.201.23.232] (port=47588 helo=giis.co.in) by p3plcpnl0639.prod.phx3.secureserver.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.87) (envelope-from ) id 1cXAtX-0001gw-6K; Fri, 27 Jan 2017 11:05:07 -0700 Date: Fri, 27 Jan 2017 23:35:01 +0530 From: "Lakshmipathi.G" To: eguan@redhat.com, fstests@vger.kernel.org, linux-btrfs@vger.kernel.org Subject: [PATCH] xfstests: btrfs/047: check btrfs-convert with extent and non-extent source Message-ID: <20170127180501.GA18125@giis.co.in> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - p3plcpnl0639.prod.phx3.secureserver.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - giis.co.in X-Get-Message-Sender-Via: p3plcpnl0639.prod.phx3.secureserver.net: authenticated_id: lakshmipathi.g@giis.co.in X-Authenticated-Sender: p3plcpnl0639.prod.phx3.secureserver.net: lakshmipathi.g@giis.co.in X-Source: X-Source-Args: X-Source-Dir: X-CMAE-Envelope: MS4wfJQbnkebfmEBwAZd1BsKe9fbJ/RTU9E42BA8Uxp1gp1X0KcEKG+TszoKZ8Uj9vdRg30kc0m1SVr+xb3wnAKK++N5Gb4q+dfErJoiKDyDWJlqbJIIzGWq w4eIBCaZldX7WVa0XYooxwTpMvy6Zp6rk8u6o6bzv+GsIDsNwFdlsOVbsiY3wqvGt0MZZgqVOz9NotZRy1jkwpjyjJJj5LuDYOB8gi08CHZy4ShJ1RSjY55k J5SV5j9oMeKDfy+7kS4C8g== Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This is used to check the source which contains combination of Ext3 files in non-extent format and Ext4 extent-files. And validate the file md5sums before and after conversion. btrfs/012: BTRFS_CONVERT_PROG,E2FSCK_PROG definitions reused from common/config Signed-off-by: Lakshmipathi.G --- common/config | 3 ++ tests/btrfs/012 | 3 -- tests/btrfs/047 | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/047.out | 2 + tests/btrfs/group | 1 + 5 files changed, 128 insertions(+), 3 deletions(-) create mode 100755 tests/btrfs/047 create mode 100644 tests/btrfs/047.out diff --git a/common/config b/common/config index 0706aca..fa89f42 100644 --- a/common/config +++ b/common/config @@ -240,11 +240,14 @@ case "$HOSTOS" in export DUMP_F2FS_PROG="`set_prog_path dump.f2fs`" export BTRFS_UTIL_PROG="`set_prog_path btrfs`" export BTRFS_SHOW_SUPER_PROG="`set_prog_path btrfs-show-super`" + export BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`" export XFS_FSR_PROG="`set_prog_path xfs_fsr`" export MKFS_NFS_PROG="false" export MKFS_CIFS_PROG="false" export MKFS_OVERLAY_PROG="false" export MKFS_REISER4_PROG="`set_prog_path mkfs.reiser4`" + export E2FSCK_PROG="`set_prog_path e2fsck`" + export TUNE2FS_PROG="`set_prog_path tune2fs`" ;; esac diff --git a/tests/btrfs/012 b/tests/btrfs/012 index 6a3cb81..85c82f0 100755 --- a/tests/btrfs/012 +++ b/tests/btrfs/012 @@ -54,9 +54,6 @@ _supported_fs btrfs _supported_os Linux _require_scratch_nocheck -BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`" -E2FSCK_PROG="`set_prog_path e2fsck`" - _require_command "$BTRFS_CONVERT_PROG" btrfs-convert _require_command "$MKFS_EXT4_PROG" mkfs.ext4 _require_command "$E2FSCK_PROG" e2fsck diff --git a/tests/btrfs/047 b/tests/btrfs/047 new file mode 100755 index 0000000..d349d12 --- /dev/null +++ b/tests/btrfs/047 @@ -0,0 +1,122 @@ +#! /bin/bash +# FS QA Test 047 +# +# Test btrfs-convert +# +# 1) create ext3 filesystem & populate it. +# 2) upgrade ext3 filesystem to ext4. +# 3) populate data. +# 4) source has combination of non-extent and extent files. +# 5) convert it to btrfs, mount and verify contents. +#----------------------------------------------------------------------- +# Copyright (c) 2017 Lakshmipathi.G 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.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full + +# real QA test starts here + +# Modify as appropriate. +_supported_fs btrfs +_supported_os Linux +_require_scratch_nocheck + +_require_command "$BTRFS_CONVERT_PROG" btrfs-convert +_require_command "$MKFS_EXT4_PROG" mkfs.ext4 +_require_command "$E2FSCK_PROG" e2fsck +_require_command "$TUNE2FS_PROG" tune2fs + +rm -f $seqres.full + +BLOCK_SIZE=`_get_block_size $TEST_DIR` +EXT_MD5SUM="$tmp.ext43" +BTRFS_MD5SUM="$tmp.btrfs" + +_populate_data(){ + data_path=$1 + mkdir -p $data_path + args=`_scale_fsstress_args -p 20 -n 100 $FSSTRESS_AVOID -d $data_path` + echo "Run fsstress $args" >>$seqres.full + $FSSTRESS_PROG $args >/dev/null 2>&1 & + fsstress_pid=$! + wait $fsstress_pid +} + +# Create & populate an ext3 filesystem +$MKFS_EXT4_PROG -F -t ext3 -b $BLOCK_SIZE $SCRATCH_DEV > $seqres.full 2>&1 || \ + _notrun "Could not create ext3 filesystem" + +# mount and populate non-extent file +mount -t ext3 $SCRATCH_DEV $SCRATCH_MNT +_populate_data "$SCRATCH_MNT/ext3_ext4_data/ext3" +_scratch_unmount + +# Upgrade it to ext4. +$TUNE2FS_PROG -O extents,uninit_bg,dir_index $SCRATCH_DEV >> $seqres.full 2>&1 +# After Conversion, its highly recommended to run e2fsck. +$E2FSCK_PROG -fyD $SCRATCH_DEV >> $seqres.full 2>&1 + +# mount and populate extent file +mount -t ext4 $SCRATCH_DEV $SCRATCH_MNT +_populate_data "$SCRATCH_MNT/ext3_ext4_data/ext4" + +# Compute md5 of ext3,ext4 files. +find "$SCRATCH_MNT/ext3_ext4_data" -type f -fprint "$EXT_MD5SUM" +sort "$EXT_MD5SUM" -o "$EXT_MD5SUM" +_scratch_unmount + +# Convert non-extent & extent data to btrfs, mount it, verify the data +$BTRFS_CONVERT_PROG $SCRATCH_DEV >> $seqres.full 2>&1 || \ + _fail "btrfs-convert failed" +_scratch_mount || _fail "Could not mount new btrfs fs" + +# Compute md5 for converted files. +find "$SCRATCH_MNT/ext3_ext4_data" -type f -fprint "$BTRFS_MD5SUM" +sort "$BTRFS_MD5SUM" -o "$BTRFS_MD5SUM" + +# Compare two md5sum files. +btrfs_perm=`md5sum "$BTRFS_MD5SUM" | cut -f1 -d' '` +ext_perm=`md5sum "$EXT_MD5SUM" | cut -f1 -d' '` + +if [ "$btrfs_perm" != "$ext_perm" ];then + echo "md5sum mismatch" +fi + +# success, all done +echo "Silence is golden" +status=0 +exit diff --git a/tests/btrfs/047.out b/tests/btrfs/047.out new file mode 100644 index 0000000..48db9bf --- /dev/null +++ b/tests/btrfs/047.out @@ -0,0 +1,2 @@ +QA output created by 047 +Silence is golden diff --git a/tests/btrfs/group b/tests/btrfs/group index 3fbf706..224a082 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -49,6 +49,7 @@ 044 auto quick send 045 auto quick send 046 auto quick send +047 auto convert 048 auto quick 049 auto quick 050 auto quick send