From patchwork Mon Dec 15 05:02:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 5490301 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 862F3BEEA8 for ; Mon, 15 Dec 2014 05:03:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B5D9F209B5 for ; Mon, 15 Dec 2014 05:03:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 976AF209B1 for ; Mon, 15 Dec 2014 05:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750773AbaLOFDC (ORCPT ); Mon, 15 Dec 2014 00:03:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47645 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750714AbaLOFDC (ORCPT ); Mon, 15 Dec 2014 00:03:02 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBF531wK002184 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 15 Dec 2014 00:03:01 -0500 Received: from localhost (vpn1-113-135.nay.redhat.com [10.66.113.135]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sBF52wng015196; Mon, 15 Dec 2014 00:03:00 -0500 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH v4] generic/299: various fixes Date: Mon, 15 Dec 2014 13:02:34 +0800 Message-Id: <1418619754-15620-1-git-send-email-eguan@redhat.com> In-Reply-To: <1418359401-8240-1-git-send-email-eguan@redhat.com> References: <1418359401-8240-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix two problems in generic/299 1. Remove $seqres.full before test, otherwise the file is growing all the time. 2. Make sure fio really exits, otherwise fio would block umount. $pid is the pid of function run_check not fio, sometimes fio is still there when $pid is dead and blocking umount. Reviewed-by: Theodore Ts'o Signed-off-by: Eryu Guan --- v4: - use pgrep -f instead of pgrep to search for fio (Ted) v3: - rebase and skip the replacing fallocate/truncate part (Dave) v2: - remove $seqres.full before _require_fio, which writes to $seqres.full too tests/generic/299 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/generic/299 b/tests/generic/299 index e49eba9..953f1bd 100755 --- a/tests/generic/299 +++ b/tests/generic/299 @@ -109,6 +109,8 @@ rw=randrw filename=buffered-aio-verifier EOF +rm -f $seqres.full + _require_fio $fio_config _require_xfs_io_command "falloc" @@ -136,7 +138,7 @@ _workout() done # Following like will check that pid is still run. # Once fio exit we can stop fallocate/truncate loop - kill -0 $pid > /dev/null 2>&1 || break + pgrep -f "$FIO_PROG" > /dev/null 2>&1 || break done wait $pid }