From patchwork Tue May 22 09:49:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiao Yang X-Patchwork-Id: 10417799 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 D8EC96053B for ; Tue, 22 May 2018 10:01:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7B8C28BAC for ; Tue, 22 May 2018 10:01:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCA9828BAE; Tue, 22 May 2018 10:01: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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI 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 3D2E928BAC for ; Tue, 22 May 2018 10:01:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751060AbeEVKBn (ORCPT ); Tue, 22 May 2018 06:01:43 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:61033 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750733AbeEVKBn (ORCPT ); Tue, 22 May 2018 06:01:43 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="40207359" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 22 May 2018 18:01:38 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 6F41D4B3EF2E; Tue, 22 May 2018 18:01:34 +0800 (CST) Received: from RHEL7U5Alpha_SERVER.g08.fujitsu.local (10.167.220.185) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Tue, 22 May 2018 18:01:34 +0800 From: Xiao Yang To: CC: , , Xiao Yang Subject: [PATCH v3] check: Make the test harness unmount fs when finishing a test Date: Tue, 22 May 2018 17:49:59 +0800 Message-ID: <1526982599-8914-1-git-send-email-yangx.jy@cn.fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526969013-16134-1-git-send-email-yangx.jy@cn.fujitsu.com> References: <1526969013-16134-1-git-send-email-yangx.jy@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.220.185] X-yoursite-MailScanner-ID: 6F41D4B3EF2E.AD340 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: yangx.jy@cn.fujitsu.com Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Finishing xfs/132 left a shutdown scratch fs and the test harness didn't unmount the fs(because we told it not to check the fs) so the test harness called by subsequent xfs/133 tried to "test -d $SCRATCH_MNT" and received the IO error from the dead fs. i.e. Running xfs/132 and xfs/133 together got the following error: ------------------------------------------------------------ ... xfs/132 1s ... 1s xfs/133 1s ... [failed, exit status 1] - output mismatch (see /var/lib/xfstests/results//xfs/133.out.bad) ... QA output created by 133 -Format and mount -Corrupt filesystem -Remount, try to append -Write did not succeed (ok). +SCRATCH_DEV=/dev/sda11 is mounted but not on SCRATCH_MNT=common/config: - aborting +Already mounted result: +/dev/sda11 /mnt/xfstests/scratch ... ------------------------------------------------------------ Even if we don't check fs, the test harness is supposed to unmount fs and return an initial state before running the next test. Signed-off-by: Xiao Yang Reviewed-by: Dave Chinner --- check | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/check b/check index 96198ac..f6fb352 100755 --- a/check +++ b/check @@ -489,10 +489,14 @@ _check_filesystems() if [ -f ${RESULT_DIR}/require_test ]; then _check_test_fs || err=true rm -f ${RESULT_DIR}/require_test* + else + _test_unmount 2> /dev/null fi if [ -f ${RESULT_DIR}/require_scratch ]; then _check_scratch_fs || err=true rm -f ${RESULT_DIR}/require_scratch* + else + _scratch_unmount 2> /dev/null fi }