From patchwork Thu Oct 24 05:54:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengguang Xu X-Patchwork-Id: 11208321 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B6698913 for ; Thu, 24 Oct 2019 05:55:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97C492166E for ; Thu, 24 Oct 2019 05:55:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mykernel.net header.i=cgxu519@mykernel.net header.b="LjTCdsk9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437590AbfJXFzG (ORCPT ); Thu, 24 Oct 2019 01:55:06 -0400 Received: from sender2-of-o52.zoho.com.cn ([163.53.93.247]:21146 "EHLO sender2-of-o52.zoho.com.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437581AbfJXFzG (ORCPT ); Thu, 24 Oct 2019 01:55:06 -0400 ARC-Seal: i=1; a=rsa-sha256; t=1571896492; cv=none; d=zoho.com.cn; s=zohoarc; b=GfL5ye2ikkQsBotN9w2Hp8ootf905d80SJFKOo3m6XbwyM3SHqRaOHuV2c+acj391psR5yIqR3mBK74w5Uxoif6CwcXItv7D19h/VdZlcN5Npqj/r6xfD203zk6cAGSdTxqBWYYnmqYIRMpPqV9ctYpIwI3tUIqu2L7JYQLb6Wk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com.cn; s=zohoarc; t=1571896492; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To:ARC-Authentication-Results; bh=wblliOr7vp6+9n3j45jIkPj1z2Puae0BUeBmASa/e7E=; b=XRKoC+EOV2jZImnzLQPCmHojv7caNfYjKnx9sLY47t3Rsm56ilMY0bVsfia74aWCInsB+2CpFkdJ2hPqZeyDQM3IvxkYflDjE2SJcVIWdZD8Uy9Dy9bJ+kfhA7JSYNkBQiSRbQf+1yi23vV4KMTrKQU+941501aisrTVaepz0Bo= ARC-Authentication-Results: i=1; mx.zoho.com.cn; dkim=pass header.i=mykernel.net; spf=pass smtp.mailfrom=cgxu519@mykernel.net; dmarc=pass header.from= header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1571896492; s=zohomail; d=mykernel.net; i=cgxu519@mykernel.net; h=From:To:Cc:Message-ID:Subject:Date:MIME-Version:Content-Transfer-Encoding:Content-Type; l=4842; bh=wblliOr7vp6+9n3j45jIkPj1z2Puae0BUeBmASa/e7E=; b=LjTCdsk9snYTugBJdgID4lvEP7jk0p6O9VqqLjYZRxQLz+IWbHdSlsnrABrk4Ovw gGPWhCL758JsSXXhmWilnDyaE7nKGUj/G4t4C+niOINAOZO+I+JYMe4hoVAUj5uFjHs HekdxL1PPFQ2XT7XRqRcgw9jYJCIdqidehsliveI= Received: from localhost.localdomain (218.18.229.179 [218.18.229.179]) by mx.zoho.com.cn with SMTPS id 1571896490177924.8735194183726; Thu, 24 Oct 2019 13:54:50 +0800 (CST) From: Chengguang Xu To: fstests@vger.kernel.org, linux-unionfs@vger.kernel.org Cc: guaneryu@gmail.com, amir73il@gmail.com, miklos@szeredi.hu, Chengguang Xu Message-ID: <20191024055435.6059-1-cgxu519@mykernel.net> Subject: [PATCH v2] overlay/066: copy-up test for variant sparse files Date: Thu, 24 Oct 2019 13:54:35 +0800 X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ZohoCNMailClient: External Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org This is intensive copy-up test for sparse files, these cases will be mainly used for regression test of copy-up improvement for sparse files. Signed-off-by: Chengguang Xu Reviewed-by: Amir Goldstein --- v1->v2: - Call _get_block_size to get fs block size. - Add comment for test space requirement. - Print meaningful error message when copy-up fail. - Adjust random hole range to 1M~5M. - Fix typo. tests/overlay/066 | 120 ++++++++++++++++++++++++++++++++++++++++++ tests/overlay/066.out | 2 + tests/overlay/group | 1 + 3 files changed, 123 insertions(+) create mode 100755 tests/overlay/066 create mode 100644 tests/overlay/066.out diff --git a/tests/overlay/066 b/tests/overlay/066 new file mode 100755 index 00000000..b01fc2a4 --- /dev/null +++ b/tests/overlay/066 @@ -0,0 +1,120 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2019 Chengguang Xu +# All Rights Reserved. +# +# FS QA Test 066 +# +# Test overlayfs copy-up function for variant sparse files. +# +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 generic +_supported_os Linux +_require_test +_require_scratch + +# Remove all files from previous tests +_scratch_mkfs +# We have totally 14 test files in this test, +# one file for 100M and 13 files for 10M. +_require_fs_space $OVL_BASE_SCRATCH_MNT $((10*1024*13 + 100*1024*1)) + +lowerdir=$OVL_BASE_SCRATCH_MNT/$OVL_LOWER +upperdir=$OVL_BASE_SCRATCH_MNT/$OVL_UPPER +testfile="copyup_sparse_test" +mkdir -p $lowerdir + +# Create a completely empty hole file. +$XFS_IO_PROG -fc "truncate 10M" "${lowerdir}/${testfile}_empty_holefile" \ + >>$seqres.full + +iosize=$(_get_block_size "${lowerdir}") +if [ $iosize -le 1024 ]; then + iosize=1 +else + iosize=`expr $iosize / 1024` +fi + +# Create test files with different hole size patterns. +while [ $iosize -le 2048 ]; do + pos=$iosize + $XFS_IO_PROG -fc "truncate 10M" \ + "${lowerdir}/${testfile}_iosize${iosize}K_holefile" >>$seqres.full + while [ $pos -lt 8192 ]; do + $XFS_IO_PROG -fc "pwrite ${pos}K ${iosize}K" \ + "${lowerdir}/${testfile}_iosize${iosize}K_holefile" >>$seqres.full + pos=`expr $pos + $iosize + $iosize` + done + iosize=`expr $iosize + $iosize` +done + +# Create test file with many random holes(1M~5M). +$XFS_IO_PROG -fc "truncate 100M" "${lowerdir}/${testfile}_random_holefile" \ + >>$seqres.full +pos=2048 +while [ $pos -le 81920 ]; do + iosize=`expr $RANDOM % 5120` + if [ $iosize -lt 1024 ]; then + iosize=`expr $iosize + 1024` + fi + $XFS_IO_PROG -fc "pwrite ${pos}K ${iosize}K" \ + "${lowerdir}/${testfile}_random_holefile" >>$seqres.full + pos=`expr $pos + $iosize + $iosize` +done + +_scratch_mount + +# Open the files should succeed, no errors are expected. +for f in $SCRATCH_MNT/*; do + $XFS_IO_PROG -c "open" $f >>$seqres.full +done + +echo "Silence is golden" + +# Check all copy-up files in upper layer. +iosize=$(_get_block_size "${lowerdir}") +if [ $iosize -le 1024 ]; then + iosize=1 +else + iosize=`expr $iosize / 1024` +fi + +while [ $iosize -le 2048 ]; do + diff "${lowerdir}/${testfile}_iosize${iosize}K_holefile" \ + "${upperdir}/${testfile}_iosize${iosize}K_holefile" >>$seqres.full ||\ + echo "${upperdir}/${testfile}_iosize${iosize}K_holefile" copy up failed! + iosize=`expr $iosize + $iosize` +done + +diff "${lowerdir}/${testfile}_empty_holefile" "${upperdir}/${testfile}_empty_holefile" \ + >>$seqres.full || echo "${upperdir}/${testfile}_empty_holefile" copy up failed! +diff "${lowerdir}/${testfile}_random_holefile" "${upperdir}/${testfile}_random_holefile" \ + >>$seqres.full || echo "${upperdir}/${testfile}_random_holefile" copy up failed! + +# success, all done +status=0 +exit diff --git a/tests/overlay/066.out b/tests/overlay/066.out new file mode 100644 index 00000000..b60cc24c --- /dev/null +++ b/tests/overlay/066.out @@ -0,0 +1,2 @@ +QA output created by 066 +Silence is golden diff --git a/tests/overlay/group b/tests/overlay/group index ef8517a1..1dec7db9 100644 --- a/tests/overlay/group +++ b/tests/overlay/group @@ -68,3 +68,4 @@ 063 auto quick whiteout 064 auto quick copyup 065 auto quick mount +066 auto quick copyup