From patchwork Wed Feb 7 21:19:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 10206083 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 A08EF60327 for ; Wed, 7 Feb 2018 21:19:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FEB929140 for ; Wed, 7 Feb 2018 21:19:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84EE029146; Wed, 7 Feb 2018 21:19:32 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 21F7629140 for ; Wed, 7 Feb 2018 21:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932243AbeBGVTb (ORCPT ); Wed, 7 Feb 2018 16:19:31 -0500 Received: from userp2130.oracle.com ([156.151.31.86]:50274 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932196AbeBGVT3 (ORCPT ); Wed, 7 Feb 2018 16:19:29 -0500 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w17LHFde141603; Wed, 7 Feb 2018 21:19:27 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=subject : from : to : cc : date : message-id : in-reply-to : references : mime-version : content-type : content-transfer-encoding; s=corp-2017-10-26; bh=h6FL9LN1w/TIo20VuP+76SPOJa7asufYb0avL9B98pY=; b=wLMmEC//EssXLGGgigl58qm2rFAbFiwa18PX4lmbyDsJ3ajDIch0a5y3GoLzMPi+BJAk D6WosssnxQdpl4pO/lTnqMegQ0iRQAnlPPLWbUim80E/0aCdSOMxprEgiLm2Hgx2S+Sh p6pyLWO4RZ0JRBN0ORfZdjbVvMv3F58QvydpvMmRLLoBbXfL9ttRGdTsxDOlMzmlZO/2 lVvXlrDbBXdduMIr3yMVB1vjnTPq4prk+OQzfeQnpuGokUvU0i+Uo1U2pyg9AbJZsIQ3 i8OKcx/MSkcYdB1J6GAfRHATdEkxeJdoeby7fZqk4wRrwrE0hi+6fCl25CBa5GyRu0Li rw== Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp2130.oracle.com with ESMTP id 2g0950r2d3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Feb 2018 21:19:26 +0000 Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w17LJQ2Y017521 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Wed, 7 Feb 2018 21:19:26 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id w17LJQg6023904; Wed, 7 Feb 2018 21:19:26 GMT Received: from localhost (/67.169.218.210) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Feb 2018 13:19:25 -0800 Subject: [PATCH 1/4] xfs_scrub: remove -y parameter From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Wed, 07 Feb 2018 13:19:24 -0800 Message-ID: <151803836498.19313.14327204884614672549.stgit@magnolia> In-Reply-To: <151803835881.19313.17455678207236452557.stgit@magnolia> References: <151803835881.19313.17455678207236452557.stgit@magnolia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8798 signatures=668663 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1802070269 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Remove the -y parameter from scrub runs since we're removing that option from xfs_scrub. Signed-off-by: Darrick J. Wong --- common/fuzzy | 2 +- tests/xfs/286 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" 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 8c5417a..f78fc17 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -217,7 +217,7 @@ __scratch_xfs_fuzz_field_test() { # Try fixing the filesystem online?! if [ "${repair}" = "online" ] || [ "${repair}" = "both" ]; then __fuzz_notify "++ Try to repair filesystem online" - _scratch_scrub -y 2>&1 + _scratch_scrub 2>&1 res=$? test $res -ne 0 && \ (>&2 echo "online repair failed ($res) with ${field} = ${fuzzverb}.") diff --git a/tests/xfs/286 b/tests/xfs/286 index 67128b2..e71b933 100755 --- a/tests/xfs/286 +++ b/tests/xfs/286 @@ -1,7 +1,7 @@ #! /bin/bash # FS QA Test No. 286 # -# Race fio and xfs_scrub -y for a while to see if we crash or livelock. +# Race fio and xfs_scrub for a while to see if we crash or livelock. # #----------------------------------------------------------------------- # Copyright (c) 2017 Oracle, Inc. All Rights Reserved. @@ -75,7 +75,7 @@ end=$((start + (60 * TIME_FACTOR) )) killstress & echo "Repair started at $(date --date="@${start}"), ending at $(date --date="@${end}")" >> $seqres.full while [ "$(date +%s)" -lt "$end" ]; do - XFS_SCRUB_FORCE_REPAIR=1 $TIMEOUT_PROG -s TERM $(( end - $(date +%s) + 2 )) $XFS_SCRUB_PROG -d -T -v -y $SCRATCH_MNT >> $seqres.full + XFS_SCRUB_FORCE_REPAIR=1 $TIMEOUT_PROG -s TERM $(( end - $(date +%s) + 2 )) $XFS_SCRUB_PROG -d -T -v $SCRATCH_MNT >> $seqres.full done echo "Test done"