Return-Path: Received: from mx144.netapp.com ([216.240.21.25]:7085 "EHLO mx144.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753489AbdEJSjw (ORCPT ); Wed, 10 May 2017 14:39:52 -0400 Subject: Re: [PATCH v6 4/5] generic/432: Add a copy test for overwriting small amounts of data To: "Darrick J. Wong" CC: , , References: <20170510174628.22895-1-Anna.Schumaker@Netapp.com> <20170510174628.22895-5-Anna.Schumaker@Netapp.com> <20170510183745.GE5970@birch.djwong.org> From: Anna Schumaker Message-ID: <658f2572-9767-3dd7-c48e-9cb8f2b28510@Netapp.com> Date: Wed, 10 May 2017 14:39:46 -0400 MIME-Version: 1.0 In-Reply-To: <20170510183745.GE5970@birch.djwong.org> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: On 05/10/2017 02:37 PM, Darrick J. Wong wrote: > On Wed, May 10, 2017 at 01:46:27PM -0400, Anna Schumaker wrote: >> This test is similar to 345, except that it copies one byte at a time to > > 345? Or is that now 431? Perhaps amend the commit message to "This > test is similar to the previous one, except..."? Yeah, I forgot to update that :( It's supposed to be for the previous test, so that's probably the best wording to use. Anna > > Otherwise, the tests run ok on xfs and ext4 and look ok, so for the whole set > Reviewed-by: Darrick J. Wong > > --D > >> make sure that this case works as expected. >> >> Signed-off-by: Anna Schumaker >> --- >> tests/generic/432 | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> tests/generic/432.out | 17 ++++++++++ >> tests/generic/group | 1 + >> 3 files changed, 105 insertions(+) >> create mode 100755 tests/generic/432 >> create mode 100644 tests/generic/432.out >> >> diff --git a/tests/generic/432 b/tests/generic/432 >> new file mode 100755 >> index 00000000..9cd899ce >> --- /dev/null >> +++ b/tests/generic/432 >> @@ -0,0 +1,87 @@ >> +#!/bin/bash >> +# FS QA Test No. 432 >> +# >> +# Tests vfs_copy_file_range(): >> +# - Copy a small file >> +# - Use copy to swap data at beginning and end >> +# - Use copy to swap data in the middle >> +# - Use copy to swap data in a small file >> +#----------------------------------------------------------------------- >> +# Copyright (c) 2017 Netapp, Inc. 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 -rf $tmp.* >> +} >> + >> +# get standard environment >> +. common/rc >> +. common/filter >> + >> +# real QA test starts here >> +_supported_fs generic >> +_supported_os Linux >> + >> +_require_xfs_io_command "copy_range" >> +_require_test >> + >> +testdir=$TEST_DIR/test-$seq >> +rm -rf $testdir >> +mkdir $testdir >> +rm -f $seqres.full >> + >> +echo "Create the original file and then copy" >> +echo -n "abcde" > $testdir/file >> +$XFS_IO_PROG -f -c "copy_range $testdir/file" "$testdir/copy" 2>&1 >> +cmp $testdir/file $testdir/copy >> +echo "Original md5sums:" >> +md5sum $testdir/{file,copy} | _filter_test_dir >> + >> +echo "Swap beginning and end of original file" >> +$XFS_IO_PROG -f -c "copy_range -s 0 -d 4 -l 1 $testdir/file" "$testdir/copy" 2>&1 >> +$XFS_IO_PROG -f -c "copy_range -s 4 -d 0 -l 1 $testdir/file" "$testdir/copy" 2>&1 >> +echo -n "ebcda" | cmp $testdir/copy >> +echo "md5sums after swapping beginning and end:" >> +md5sum $testdir/{file,copy} | _filter_test_dir >> + >> +echo "Swap middle parts of original file" >> +$XFS_IO_PROG -f -c "copy_range -s 1 -d 3 -l 1 $testdir/file" "$testdir/copy" 2>&1 >> +$XFS_IO_PROG -f -c "copy_range -s 3 -d 1 -l 1 $testdir/file" "$testdir/copy" 2>&1 >> +echo -n "edcba" | cmp $testdir/copy >> +echo "md5sums after swapping middle:" >> +md5sum $testdir/{file,copy} | _filter_test_dir >> + >> +echo "Copy tail of original file onto copy" >> +$XFS_IO_PROG -f -c "copy_range -s 1 -d 3 -l 4 $testdir/file" "$testdir/copy" 2>&1 >> +echo -n "edcbcde" | cmp $testdir/copy >> +echo "md5sums after copying tail:" >> +md5sum $testdir/{file,copy} | _filter_test_dir >> + >> +#success, all done >> +status=0 >> +exit >> diff --git a/tests/generic/432.out b/tests/generic/432.out >> new file mode 100644 >> index 00000000..eec84392 >> --- /dev/null >> +++ b/tests/generic/432.out >> @@ -0,0 +1,17 @@ >> +QA output created by 432 >> +Create the original file and then copy >> +Original md5sums: >> +ab56b4d92b40713acc5af89985d4b786 TEST_DIR/test-432/file >> +ab56b4d92b40713acc5af89985d4b786 TEST_DIR/test-432/copy >> +Swap beginning and end of original file >> +md5sums after swapping beginning and end: >> +ab56b4d92b40713acc5af89985d4b786 TEST_DIR/test-432/file >> +32db1f6d06d15f7e38e1ab1c69da498a TEST_DIR/test-432/copy >> +Swap middle parts of original file >> +md5sums after swapping middle: >> +ab56b4d92b40713acc5af89985d4b786 TEST_DIR/test-432/file >> +295228f3d82d344bbcf2f0030519c2ea TEST_DIR/test-432/copy >> +Copy tail of original file onto copy >> +md5sums after copying tail: >> +ab56b4d92b40713acc5af89985d4b786 TEST_DIR/test-432/file >> +0c4aac952f72fa078e2f8419aca70b28 TEST_DIR/test-432/copy >> diff --git a/tests/generic/group b/tests/generic/group >> index 608c45b2..43aac9fd 100644 >> --- a/tests/generic/group >> +++ b/tests/generic/group >> @@ -434,3 +434,4 @@ >> 429 auto quick copy >> 430 auto quick copy >> 431 auto quick copy >> +432 auto quick copy >> -- >> 2.12.2 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe fstests" in >> the body of a message to majordomo@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html