From patchwork Tue May 9 17:56:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Bo X-Patchwork-Id: 9718845 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 B6BE560236 for ; Tue, 9 May 2017 18:58:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB17828459 for ; Tue, 9 May 2017 18:58:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9ED9A2845D; Tue, 9 May 2017 18:58:08 +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=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY 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 102232845C for ; Tue, 9 May 2017 18:58:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754223AbdEIS57 (ORCPT ); Tue, 9 May 2017 14:57:59 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:42214 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753684AbdEIS54 (ORCPT ); Tue, 9 May 2017 14:57:56 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v49IvqN7025841 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 May 2017 18:57:52 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id v49Ivqw1014934 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 9 May 2017 18:57:52 GMT Received: from abhmp0019.oracle.com (abhmp0019.oracle.com [141.146.116.25]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v49IvpSE022476; Tue, 9 May 2017 18:57:52 GMT Received: from localhost.us.oracle.com (/10.211.47.181) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 09 May 2017 11:57:51 -0700 From: Liu Bo To: fstests@vger.kernel.org Cc: linux-btrfs@vger.kernel.org, Filipe Manana , Eryu Guan Subject: [PATCH 4/6] fstests: regression test for btrfs buffered read's repair Date: Tue, 9 May 2017 11:56:09 -0600 Message-Id: <1494352571-17199-5-git-send-email-bo.li.liu@oracle.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1494352571-17199-1-git-send-email-bo.li.liu@oracle.com> References: <1494352571-17199-1-git-send-email-bo.li.liu@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This case tests whether buffered read can repair the bad copy if we have a good copy. Commit 20a7db8ab3f2 ("btrfs: add dummy callback for readpage_io_failed and drop checks") introduced the regression. The upstream fix is Btrfs: bring back repair during read Signed-off-by: Liu Bo --- tests/btrfs/141 | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/141.out | 39 ++++++++++++++++++ tests/btrfs/group | 1 + 3 files changed, 156 insertions(+) create mode 100755 tests/btrfs/141 create mode 100644 tests/btrfs/141.out diff --git a/tests/btrfs/141 b/tests/btrfs/141 new file mode 100755 index 0000000..70f2952 --- /dev/null +++ b/tests/btrfs/141 @@ -0,0 +1,116 @@ +#! /bin/bash +# FS QA Test 141 +# +# Regression test for btrfs buffered read's repair during read. +# +# Commit 20a7db8ab3f2 ("btrfs: add dummy callback for readpage_io_failed +# and drop checks") introduced the regression. +# +# The upstream fix is +# Btrfs: bring back repair during read +# +#----------------------------------------------------------------------- +# Copyright (c) 2017 Liu Bo. 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_dev_pool 2 + +_require_btrfs_command inspect-internal dump-tree +_require_command "$FILEFRAG_PROG" filefrag + +get_physical() +{ + # $1 is logical address + # print chunk tree and find devid 2 which is $SCRATCH_DEV + $BTRFS_UTIL_PROG inspect-internal dump-tree -t 3 $SCRATCH_DEV | \ + grep $1 -A 6 | awk '($1 ~ /stripe/ && $3 ~ /devid/ && $4 ~ /1/) { print $6 }' +} + +_scratch_dev_pool_get 2 +# step 1, create a raid1 btrfs which contains one 128k file. +echo "step 1......mkfs.btrfs" >>$seqres.full + +mkfs_opts="-d raid1 -b 1G" +_scratch_pool_mkfs $mkfs_opts >>$seqres.full 2>&1 + +# -o nospace_cache makes sure data is written to the start position of the data +# chunk +_scratch_mount -o nospace_cache + +$XFS_IO_PROG -f -d -c "pwrite -S 0xaa -b 128K 0 128K" "$SCRATCH_MNT/foobar" | _filter_xfs_io + +# step 2, corrupt the first 64k of one copy (on SCRATCH_DEV which is the first +# one in $SCRATCH_DEV_POOL +echo "step 2......corrupt file extent" >>$seqres.full + +${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar >> $seqres.full +logical_in_btrfs=`${FILEFRAG_PROG} -v $SCRATCH_MNT/foobar | _filter_filefrag | cut -d '#' -f 1` +physical_on_scratch=`get_physical ${logical_in_btrfs}` + +_scratch_unmount +$XFS_IO_PROG -d -c "pwrite -S 0xbb -b 64K $physical_on_scratch 64K" $SCRATCH_DEV | _filter_xfs_io + +_scratch_mount + +# step 3, 128k buffered read (this read can repair bad copy) +echo "step 3......repair the bad copy" >>$seqres.full + +# since raid1 consists of two copies, and the following read may read the good +# copy directly, lets loop 10 times here and discard output that buffered reads +# give +for i in `seq 1 10`; do + echo 3 > /proc/sys/vm/drop_caches + $XFS_IO_PROG -c "pread -b 128K 0 128K" "$SCRATCH_MNT/foobar" > /dev/null + _get_current_dmesg | grep -q -e "csum failed" && break; +done + +_scratch_unmount + +# check if the repair works +$XFS_IO_PROG -c "pread -v -b 512 $physical_on_scratch 512" $SCRATCH_DEV | _filter_xfs_io + +_scratch_dev_pool_put +# success, all done +status=0 +exit diff --git a/tests/btrfs/141.out b/tests/btrfs/141.out new file mode 100644 index 0000000..2e08fc2 --- /dev/null +++ b/tests/btrfs/141.out @@ -0,0 +1,39 @@ +QA output created by 141 +wrote 131072/131072 bytes at offset 0 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +wrote 65536/65536 bytes at offset 136708096 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) +08260000: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260010: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260020: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260030: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260040: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260050: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260060: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260070: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260080: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260090: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082600f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260100: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260110: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260120: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260130: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260140: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260150: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260160: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260170: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260180: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +08260190: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601a0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601b0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601c0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601d0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601e0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +082601f0: aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa aa ................ +read 512/512 bytes at offset 136708096 +XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) diff --git a/tests/btrfs/group b/tests/btrfs/group index 1cb9c98..7b380e5 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -142,3 +142,4 @@ 138 auto compress 139 auto qgroup 140 auto quick +141 auto quick