From patchwork Fri Oct 27 00:43:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10028921 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 D228760381 for ; Fri, 27 Oct 2017 00:43:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C26E828EEA for ; Fri, 27 Oct 2017 00:43:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5A6428EF0; Fri, 27 Oct 2017 00:43:18 +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=ham 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 680B528EEC for ; Fri, 27 Oct 2017 00:43:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932404AbdJ0AnR (ORCPT ); Thu, 26 Oct 2017 20:43:17 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:23627 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932402AbdJ0AnQ (ORCPT ); Thu, 26 Oct 2017 20:43:16 -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 v9R0hEjM007435 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Oct 2017 00:43:14 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.14.4/8.14.4) with ESMTP id v9R0hEta029136 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 27 Oct 2017 00:43:14 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v9R0hDFw020809; Fri, 27 Oct 2017 00:43:13 GMT Received: from localhost (/10.145.178.58) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 26 Oct 2017 17:43:13 -0700 Date: Thu, 26 Oct 2017 17:43:12 -0700 From: "Darrick J. Wong" To: eguan@redhat.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: [PATCH 7/6] common/fuzzy: online re-scrub should not preen Message-ID: <20171027004312.GE5486@magnolia> References: <150899709935.18389.17266737014565285073.stgit@magnolia> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <150899709935.18389.17266737014565285073.stgit@magnolia> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When we're doing the second online scrub (to figure out if the repair did any good) we shouldn't let that second scrub preen the filesystem in any way. If scrub finds things it can't/won't preen that turns into a nonzero return code which gets reported (incorrectly) as a failure. Signed-off-by: Darrick J. Wong --- common/fuzzy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" 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/common/fuzzy b/common/fuzzy index 7a4b03a..87f7acc 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -275,7 +275,7 @@ __scratch_xfs_fuzz_field_test() { # which scrub doesn't know how to fix. echo "++ Online scrub" if [ "$1" != "sb 0" ]; then - _scratch_scrub -e continue 2>&1 + _scratch_scrub -n -e continue 2>&1 res=$? test $res -ne 0 && \ (>&2 echo "online re-scrub ($res) with ${field} = ${fuzzverb}.")