From patchwork Thu Jul 21 23:46:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9242683 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 A015D60574 for ; Thu, 21 Jul 2016 23:46:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 906E2223A4 for ; Thu, 21 Jul 2016 23:46:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84D7B268AE; Thu, 21 Jul 2016 23:46:44 +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 986F2223A4 for ; Thu, 21 Jul 2016 23:46:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752484AbcGUXqi (ORCPT ); Thu, 21 Jul 2016 19:46:38 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:29130 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752425AbcGUXqh (ORCPT ); Thu, 21 Jul 2016 19:46:37 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u6LNkTKx006639 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:46:29 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNkSIk018698 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 21 Jul 2016 23:46:28 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by aserv0122.oracle.com (8.13.8/8.13.8) with ESMTP id u6LNkP67026216; Thu, 21 Jul 2016 23:46:27 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 21 Jul 2016 16:46:25 -0700 Subject: [PATCH 01/17] xfs/26[34]: remove duplicate tests From: "Darrick J. Wong" To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com Date: Thu, 21 Jul 2016 16:46:21 -0700 Message-ID: <146914478187.11762.1309628175021637188.stgit@birch.djwong.org> In-Reply-To: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> References: <146914477514.11762.3144320628851923350.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: userv0021.oracle.com [156.151.31.71] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These two tests were accidentally double-added as xfs/30[78], but the newer versions have fixed up helper usage and fewer whitespace problems, so nuke the old tests. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/263 | 179 ----------------------------------------------------- tests/xfs/263.out | 13 ---- tests/xfs/264 | 180 ----------------------------------------------------- tests/xfs/264.out | 13 ---- tests/xfs/group | 2 - 5 files changed, 387 deletions(-) delete mode 100755 tests/xfs/263 delete mode 100644 tests/xfs/263.out delete mode 100755 tests/xfs/264 delete mode 100644 tests/xfs/264.out -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/xfs/263 b/tests/xfs/263 deleted file mode 100755 index 6659dee..0000000 --- a/tests/xfs/263 +++ /dev/null @@ -1,179 +0,0 @@ -#! /bin/bash -# FS QA Test No. 263 -# -# Test recovery of "lost" CoW blocks: -# - Use the debugger to fake a leftover CoW extent -# - See if xfs_repair fixes it -# -#----------------------------------------------------------------------- -# Copyright (c) 2016, Oracle and/or its affiliates. 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, filters and checks -. ./common/rc -. ./common/filter -. ./common/reflink - -# real QA test starts here -_supported_os Linux -_supported_fs xfs -_require_scratch_reflink - -rm -f $seqres.full - -echo "Format" -_scratch_mkfs > $seqres.full 2>&1 -_scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -umount $SCRATCH_MNT - -_get_agf_data() { - field="$1" - shift - - xfs_db -c 'agf 1' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}' -} - -_set_agf_data() { - field="$1" - value="$2" - shift; shift - - xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full -} - -_get_sb_data() { - field="$1" - shift - - xfs_db -c 'sb 0' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}' -} - -_set_sb_data() { - field="$1" - value="$2" - shift; shift - - xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full -} - -_filter_leftover() { - grep "^leftover" | sed -e "s/[0-9]\+/NR/g" -} - -_dump_status() { - echo "** " "$@" - xfs_db -c 'sb 0' -c p $SCRATCH_DEV - echo "** agf header" - xfs_db -c 'agf 1' -c p $SCRATCH_DEV - echo "** refcntbt" - xfs_db -c 'agf 1' -c 'addr refcntroot' -c p $SCRATCH_DEV - echo "** rmapbt" - test $is_rmap -gt 0 && xfs_db -c 'agf 1' -c 'addr rmaproot' -c p $SCRATCH_DEV - echo "** bnobt" - xfs_db -c 'agf 1' -c 'addr bnoroot' -c p $SCRATCH_DEV - echo "** cntbt" - xfs_db -c 'agf 1' -c 'addr cntroot' -c p $SCRATCH_DEV -} - -echo "We need AG1 to have a single free extent" -bno_lvl=$(_get_agf_data level -c 'addr bnoroot') -bno_nr=$(_get_agf_data numrecs -c 'addr bnoroot') -refc_lvl=$(_get_agf_data level -c 'addr refcntroot') -refc_nr=$(_get_agf_data numrecs -c 'addr refcntroot') - -test $bno_lvl -eq 0 || echo " AG 1 bnobt must only have one level" -test $bno_nr -eq 1 || echo " AG 1 bnobt must only have one record" -test $refc_lvl -eq 0 || echo " AG 1 refcountbt must only have one level" -test $refc_nr -eq 0 || echo " AG 1 refcountbt must only have one record" - -if [ $is_rmap -gt 0 ]; then - rmap_lvl=$(_get_agf_data level -c 'addr rmaproot') - rmap_nr=$(_get_agf_data numrecs -c 'addr rmaproot') - test $rmap_lvl -eq 0 || echo " AG 1 rmapbt must only have one level" -fi - -echo "Find our extent and old counter values" -bno=$(_get_agf_data "recs[1].startblock" -c 'addr bnoroot') -len=$(_get_agf_data "recs[1].blockcount" -c 'addr bnoroot') -agf_freeblks=$(_get_agf_data freeblks) -sb_fdblocks=$(_get_sb_data fdblocks) - -test $len -ge 200 || echo " AG 1 doesn't have enough free blocks" - -# Take the last 100 blocks of the free extent -debris_len=100 -debris_bno=$((bno + len - debris_len)) - -echo "Remove the extent from the freesp btrees" -_set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot' -_set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot' -_set_agf_data freeblks $((agf_freeblks - debris_len)) -_set_agf_data longest $((len - debris_len)) -_set_sb_data fdblocks $((sb_fdblocks - debris_len)) - -echo "Add the extent to the refcount btree" -_set_agf_data numrecs 1 -c 'addr refcntroot' -_set_agf_data "recs[1].startblock" $debris_bno -c 'addr refcntroot' -_set_agf_data "recs[1].blockcount" $debris_len -c 'addr refcntroot' -_set_agf_data "recs[1].refcount" 1 -c 'addr refcntroot' - -if [ $is_rmap -gt 0 ]; then - rmap_nr=$((rmap_nr + 1)) - _set_agf_data numrecs $rmap_nr -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].startblock" $debris_bno -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].blockcount" $debris_len -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].owner" -9 -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].offset" 0 -c 'addr rmaproot' -fi - -_dump_status "broken fs config" >> $seqres.full - -echo "Look for leftover warning in xfs_check" -_scratch_xfs_check | _filter_leftover - -echo "Look for leftover warning in xfs_repair" -_scratch_xfs_repair -n 2>&1 | _filter_leftover - -echo "Fix filesystem" -_scratch_xfs_repair >> $seqres.full 2>&1 || echo "xfs_repair failed?" - -_dump_status "supposedly fixed fs config" >> $seqres.full - -echo "Look for no more leftover warning in xfs_check" -_scratch_xfs_check | _filter_leftover - -echo "Look for no more leftover warning in xfs_repair" -_scratch_xfs_repair -n 2>&1 | _filter_leftover - -# success, all done -status=0 -exit diff --git a/tests/xfs/263.out b/tests/xfs/263.out deleted file mode 100644 index bc3eea9..0000000 --- a/tests/xfs/263.out +++ /dev/null @@ -1,13 +0,0 @@ -QA output created by 263 -Format -We need AG1 to have a single free extent -Find our extent and old counter values -Remove the extent from the freesp btrees -Add the extent to the refcount btree -Look for leftover warning in xfs_check -leftover CoW extent (NR/NR) len NR -Look for leftover warning in xfs_repair -leftover CoW extent (NR/NR) len NR -Fix filesystem -Look for no more leftover warning in xfs_check -Look for no more leftover warning in xfs_repair diff --git a/tests/xfs/264 b/tests/xfs/264 deleted file mode 100755 index 190361d..0000000 --- a/tests/xfs/264 +++ /dev/null @@ -1,180 +0,0 @@ -#! /bin/bash -# FS QA Test No. 264 -# -# Test recovery of "lost" CoW blocks: -# - Use the debugger to fake a leftover CoW extent -# - See if mount/umount fixes it -# -#----------------------------------------------------------------------- -# Copyright (c) 2016, Oracle and/or its affiliates. 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, filters and checks -. ./common/rc -. ./common/filter -. ./common/reflink - -# real QA test starts here -_supported_os Linux -_supported_fs xfs -_require_scratch_reflink - -rm -f $seqres.full - -echo "Format" -_scratch_mkfs > $seqres.full 2>&1 -_scratch_mount >> $seqres.full -is_rmap=$(xfs_info $SCRATCH_MNT | grep -c "rmapbt=1") -umount $SCRATCH_MNT - -_get_agf_data() { - field="$1" - shift - - xfs_db -c 'agf 1' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}' -} - -_set_agf_data() { - field="$1" - value="$2" - shift; shift - - xfs_db -x -c 'agf 1' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full -} - -_get_sb_data() { - field="$1" - shift - - xfs_db -c 'sb 0' "$@" -c "p $field" $SCRATCH_DEV | awk '{print $3}' -} - -_set_sb_data() { - field="$1" - value="$2" - shift; shift - - xfs_db -x -c 'sb 0' "$@" -c "write $field -- $value" $SCRATCH_DEV >> $seqres.full -} - -_filter_leftover() { - grep "^leftover" | sed -e "s/[0-9]\+/NR/g" -} - -_dump_status() { - echo "** " "$@" - xfs_db -c 'sb 0' -c p $SCRATCH_DEV - echo "** agf header" - xfs_db -c 'agf 1' -c p $SCRATCH_DEV - echo "** refcntbt" - xfs_db -c 'agf 1' -c 'addr refcntroot' -c p $SCRATCH_DEV - echo "** rmapbt" - test $is_rmap -gt 0 && xfs_db -c 'agf 1' -c 'addr rmaproot' -c p $SCRATCH_DEV - echo "** bnobt" - xfs_db -c 'agf 1' -c 'addr bnoroot' -c p $SCRATCH_DEV - echo "** cntbt" - xfs_db -c 'agf 1' -c 'addr cntroot' -c p $SCRATCH_DEV -} - -echo "We need AG1 to have a single free extent" -bno_lvl=$(_get_agf_data level -c 'addr bnoroot') -bno_nr=$(_get_agf_data numrecs -c 'addr bnoroot') -refc_lvl=$(_get_agf_data level -c 'addr refcntroot') -refc_nr=$(_get_agf_data numrecs -c 'addr refcntroot') - -test $bno_lvl -eq 0 || echo " AG 1 bnobt must only have one level" -test $bno_nr -eq 1 || echo " AG 1 bnobt must only have one record" -test $refc_lvl -eq 0 || echo " AG 1 refcountbt must only have one level" -test $refc_nr -eq 0 || echo " AG 1 refcountbt must only have one record" - -if [ $is_rmap -gt 0 ]; then - rmap_lvl=$(_get_agf_data level -c 'addr rmaproot') - rmap_nr=$(_get_agf_data numrecs -c 'addr rmaproot') - test $rmap_lvl -eq 0 || echo " AG 1 rmapbt must only have one level" -fi - -echo "Find our extent and old counter values" -bno=$(_get_agf_data "recs[1].startblock" -c 'addr bnoroot') -len=$(_get_agf_data "recs[1].blockcount" -c 'addr bnoroot') -agf_freeblks=$(_get_agf_data freeblks) -sb_fdblocks=$(_get_sb_data fdblocks) - -test $len -ge 200 || echo " AG 1 doesn't have enough free blocks" - -# Take the last 100 blocks of the free extent -debris_len=100 -debris_bno=$((bno + len - debris_len)) - -echo "Remove the extent from the freesp btrees" -_set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr bnoroot' -_set_agf_data "recs[1].blockcount" $((len - debris_len)) -c 'addr cntroot' -_set_agf_data freeblks $((agf_freeblks - debris_len)) -_set_agf_data longest $((len - debris_len)) -_set_sb_data fdblocks $((sb_fdblocks - debris_len)) - -echo "Add the extent to the refcount btree" -_set_agf_data numrecs 1 -c 'addr refcntroot' -_set_agf_data "recs[1].startblock" $debris_bno -c 'addr refcntroot' -_set_agf_data "recs[1].blockcount" $debris_len -c 'addr refcntroot' -_set_agf_data "recs[1].refcount" 1 -c 'addr refcntroot' - -if [ $is_rmap -gt 0 ]; then - rmap_nr=$((rmap_nr + 1)) - _set_agf_data numrecs $rmap_nr -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].startblock" $debris_bno -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].blockcount" $debris_len -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].owner" -9 -c 'addr rmaproot' - _set_agf_data "recs[$rmap_nr].offset" 0 -c 'addr rmaproot' -fi - -_dump_status "broken fs config" >> $seqres.full - -echo "Look for leftover warning in xfs_check" -_scratch_xfs_check | _filter_leftover - -echo "Look for leftover warning in xfs_repair" -_scratch_xfs_repair -n 2>&1 | _filter_leftover - -echo "Mount filesystem" -_scratch_mount -umount $SCRATCH_MNT - -_dump_status "supposedly fixed fs config" >> $seqres.full - -echo "Look for no more leftover warning in xfs_check" -_scratch_xfs_check | _filter_leftover - -echo "Look for no more leftover warning in xfs_repair" -_scratch_xfs_repair -n 2>&1 | _filter_leftover - -# success, all done -status=0 -exit diff --git a/tests/xfs/264.out b/tests/xfs/264.out deleted file mode 100644 index 3faaf42..0000000 --- a/tests/xfs/264.out +++ /dev/null @@ -1,13 +0,0 @@ -QA output created by 264 -Format -We need AG1 to have a single free extent -Find our extent and old counter values -Remove the extent from the freesp btrees -Add the extent to the refcount btree -Look for leftover warning in xfs_check -leftover CoW extent (NR/NR) len NR -Look for leftover warning in xfs_repair -leftover CoW extent (NR/NR) len NR -Mount filesystem -Look for no more leftover warning in xfs_check -Look for no more leftover warning in xfs_repair diff --git a/tests/xfs/group b/tests/xfs/group index 9f8ca0f..aa3b3ec 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -259,8 +259,6 @@ 260 auto quick quota 261 auto quick quota 262 auto quick quota -263 auto quick clone -264 auto quick clone 265 auto clone 266 dump ioctl auto quick 267 dump ioctl tape