From patchwork Wed Jul 22 10:12:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 6841761 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1201BC05AC for ; Wed, 22 Jul 2015 10:15:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 236702064D for ; Wed, 22 Jul 2015 10:15:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E595C2060E for ; Wed, 22 Jul 2015 10:15:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933771AbbGVKPo (ORCPT ); Wed, 22 Jul 2015 06:15:44 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:21453 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933107AbbGVKPo (ORCPT ); Wed, 22 Jul 2015 06:15:44 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t6MAFfhM018490 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 22 Jul 2015 10:15:41 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t6MAFfhJ003408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Wed, 22 Jul 2015 10:15:41 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t6MAFMmA008805; Wed, 22 Jul 2015 10:15:22 GMT Received: from arch2.sg.oracle.com (/10.186.101.54) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 22 Jul 2015 03:15:22 -0700 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: dsterba@suse.cz, david@fromorbit.com Subject: [PATCH v4 3/3] xfstests: btrfs: test device delete with EIO on src dev Date: Wed, 22 Jul 2015 18:12:03 +0800 Message-Id: <1437559923-32764-4-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1437559923-32764-1-git-send-email-anand.jain@oracle.com> References: <1430388527-16700-1-git-send-email-anand.jain@oracle.com> <1437559923-32764-1-git-send-email-anand.jain@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Anand Jain This test case tests if the device delete would work when the source device has failed with EIO errors. EIO errors are achieved usign the DM device. Also this test needs the latest btrfs-progs and kernel patch under title [PATCH] device delete by devid When this patch is not found in the btrfs-progs, this test will not run. However when the require patch is not found in the kernel it will fail gracefully. Signed-off-by: Anand Jain --- v3->v4: rebase on latest xfstests code v2->v3: accepts Filipe Manana's review comments, thanks v1->v2: accepts Dave Chinner's review comments, thanks common/rc | 6 +++++ tests/btrfs/096 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/btrfs/096.out | 10 +++++++ tests/btrfs/group | 1 + 4 files changed, 94 insertions(+) create mode 100755 tests/btrfs/096 create mode 100644 tests/btrfs/096.out diff --git a/common/rc b/common/rc index ff0732a..a3af58f 100644 --- a/common/rc +++ b/common/rc @@ -2717,6 +2717,12 @@ _require_test_fcntl_advisory_locks() _notrun "Require fcntl advisory locks support" } +_require_btrfs_dev_del_by_devid() +{ + $BTRFS_UTIL_PROG device delete --help | egrep devid > /dev/null 2>&1 + [ $? -eq 0 ] || _notrun "$BTRFS_UTIL_PROG too old (must support 'btrfs device delete /')" +} + _get_total_inode() { if [ -z "$1" ]; then diff --git a/tests/btrfs/096 b/tests/btrfs/096 new file mode 100755 index 0000000..7c09644 --- /dev/null +++ b/tests/btrfs/096 @@ -0,0 +1,77 @@ +#! /bin/bash +# FS QA Test No. btrfs/096 +# +# test device delete when the source device has EIO +# +# Copyright (c) 2015 Oracle. 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() +{ + _cleanup_dmerror + rm -f $tmp +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter +. ./common/filter.btrfs +. ./common/dmerror + +_supported_fs btrfs +_supported_os Linux +_need_to_be_root +_require_scratch_dev_pool 3 +_require_btrfs_dev_del_by_devid +_require_dmerror + +rm -f $seqres.full + +dev1="`echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $2}'`" +dev2="`echo $SCRATCH_DEV_POOL | $AWK_PROG '{print $3}'`" + +_init_dmerror +_scratch_mkfs_dmerror "-f -d raid1 -m raid1 $dev1 $dev2" +_mount_dmerror + +$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show + +error_devid=`$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT |\ + egrep $DMERROR_DEV | $AWK_PROG '{print $2}'` + +snapshot_cmd="$BTRFS_UTIL_PROG subvolume snapshot -r $SCRATCH_MNT" +snapshot_cmd="$snapshot_cmd $SCRATCH_MNT/snap_\`date +'%H_%M_%S_%N'\`" +run_check $FSSTRESS_PROG -d $SCRATCH_MNT -n 200 -p 8 $FSSTRESS_AVOID -x "$snapshot_cmd" -X 50 >&/dev/null + +# now load the error into the DMERROR_DEV +_load_dmerror_table + +_run_btrfs_util_prog device delete $error_devid $SCRATCH_MNT + +$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | _filter_btrfs_filesystem_show + +status=0; exit diff --git a/tests/btrfs/096.out b/tests/btrfs/096.out new file mode 100644 index 0000000..8e7139c --- /dev/null +++ b/tests/btrfs/096.out @@ -0,0 +1,10 @@ +QA output created by 096 +Label: none uuid: + Total devices FS bytes used + devid size used path SCRATCH_DEV + devid size used path /dev/mapper/error-test + +Label: none uuid: + Total devices FS bytes used + devid size used path SCRATCH_DEV + diff --git a/tests/btrfs/group b/tests/btrfs/group index ed9b3bb..7a03794 100644 --- a/tests/btrfs/group +++ b/tests/btrfs/group @@ -97,3 +97,4 @@ 093 auto quick clone 094 auto quick send 095 auto quick replace +096 auto quick replace