From patchwork Thu Aug 25 23:28:38 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: 9300147 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 9BFAA607F0 for ; Thu, 25 Aug 2016 23:28:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D41229410 for ; Thu, 25 Aug 2016 23:28:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81E1029412; Thu, 25 Aug 2016 23:28:48 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from oss.sgi.com (oss.sgi.com [192.48.182.195]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F23A429410 for ; Thu, 25 Aug 2016 23:28:47 +0000 (UTC) Received: from oss.sgi.com (localhost [IPv6:::1]) by oss.sgi.com (Postfix) with ESMTP id EA07F7CCF; Thu, 25 Aug 2016 18:28:45 -0500 (CDT) X-Original-To: xfs@oss.sgi.com Delivered-To: xfs@oss.sgi.com Received: from relay.sgi.com (relay1.corp.sgi.com [137.38.102.111]) by oss.sgi.com (Postfix) with ESMTP id 488047CBE for ; Thu, 25 Aug 2016 18:28:44 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay1.corp.sgi.com (Postfix) with ESMTP id 0C4A18F8033 for ; Thu, 25 Aug 2016 16:28:43 -0700 (PDT) X-ASG-Debug-ID: 1472167721-0bf57c55b41c7520001-NocioJ Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by cuda.sgi.com with ESMTP id C7TyxMCUQABc3QIO (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 25 Aug 2016 16:28:42 -0700 (PDT) X-Barracuda-Envelope-From: darrick.wong@oracle.com X-Barracuda-Effective-Source-IP: aserp1040.oracle.com[141.146.126.69] X-Barracuda-Apparent-Source-IP: 141.146.126.69 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u7PNSeMV006801 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Aug 2016 23:28:40 GMT Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id u7PNSeNR017863 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 25 Aug 2016 23:28:40 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 u7PNSeG3024773; Thu, 25 Aug 2016 23:28:40 GMT Received: from localhost (/10.145.178.207) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 25 Aug 2016 16:28:39 -0700 Subject: [PATCH 03/13] xfs/{130,235}: deal with an unreplayable dirty log From: "Darrick J. Wong" X-ASG-Orig-Subj: [PATCH 03/13] xfs/{130, 235}: deal with an unreplayable dirty log To: david@fromorbit.com, eguan@redhat.com, darrick.wong@oracle.com Date: Thu, 25 Aug 2016 16:28:38 -0700 Message-ID: <147216771851.32641.12882618561173838572.stgit@birch.djwong.org> In-Reply-To: <147216769914.32641.55434969009554013.stgit@birch.djwong.org> References: <147216769914.32641.55434969009554013.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0022.oracle.com [141.146.126.234] X-Barracuda-Connect: aserp1040.oracle.com[141.146.126.69] X-Barracuda-Start-Time: 1472167722 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://192.48.176.15:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 1283 X-Virus-Scanned: by bsmtpd at sgi.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=2.7 tests=BSF_SC0_MISMATCH_TO, UNPARSEABLE_RELAY X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.32328 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.00 BSF_SC0_MISMATCH_TO Envelope rcpt doesn't match header 0.00 UNPARSEABLE_RELAY Informational: message has unparseable relay lines Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, xfs@oss.sgi.com X-BeenThere: xfs@oss.sgi.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com X-Virus-Scanned: ClamAV using ClamSMTP Now that we have log replay items, an FS shutdown due to a corrupt btree results in a log that can't be replayed. The only solution here is to zap the log when we're fixing the corrupt fs, so do that here. Signed-off-by: Darrick J. Wong --- tests/xfs/130 | 3 ++- tests/xfs/235 | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/xfs/130 b/tests/xfs/130 index 7d8ea2a..554d078 100755 --- a/tests/xfs/130 +++ b/tests/xfs/130 @@ -87,7 +87,8 @@ _cp_reflink "${SCRATCH_MNT}/file1" "${SCRATCH_MNT}/file4" 2> /dev/null && \ umount "${SCRATCH_MNT}" echo "+ repair fs" -_scratch_xfs_repair >> "$seqres.full" 2>&1 +_disable_dmesg_check +_repair_scratch_fs >> "$seqres.full" 2>&1 _scratch_xfs_repair >> "$seqres.full" 2>&1 echo "+ mount image (2)" diff --git a/tests/xfs/235 b/tests/xfs/235 index c2e0340..ef51d22 100755 --- a/tests/xfs/235 +++ b/tests/xfs/235 @@ -85,7 +85,8 @@ test -s ${SCRATCH_MNT}/file4 && _fail "should not be able to copy with busted rm umount ${SCRATCH_MNT} echo "+ repair fs" -_scratch_xfs_repair >> $seqres.full 2>&1 +_disable_dmesg_check +_repair_scratch_fs >> "$seqres.full" 2>&1 _scratch_xfs_repair >> $seqres.full 2>&1 echo "+ mount image (2)"