From patchwork Fri Nov 14 17:02:50 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 5308491 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 75D8C9FD25 for ; Fri, 14 Nov 2014 17:03:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 802BA201BC for ; Fri, 14 Nov 2014 17:03:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 946EB201B4 for ; Fri, 14 Nov 2014 17:03:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934046AbaKNRDN (ORCPT ); Fri, 14 Nov 2014 12:03:13 -0500 Received: from mail-qc0-f179.google.com ([209.85.216.179]:53052 "EHLO mail-qc0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933486AbaKNRDN (ORCPT ); Fri, 14 Nov 2014 12:03:13 -0500 Received: by mail-qc0-f179.google.com with SMTP id c9so2508291qcz.38 for ; Fri, 14 Nov 2014 09:03:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=GNpAen/4QxUr/z7SzDt5GZsJwYPIvyX4ejIUxBolZGY=; b=WowTO7NuCjAqNVYTh1O7s//aB3MQnu/7cNQ5e5dCm85pKjOsYXLMXqSLoFbUjm5EGh 2zh9GwR6R57JfZuvf0TYyhpm8c5QLURHOL5usXfn5PyFphEFpwlCtrszKs8EjXjG+AaV p0FL0n+YUemdukplKZ9ZTBonFNqTf0d4ekXq7QwYysqUQYodxLmF33D5uusXs2Bx8k42 ALasWAn3vjqS9O1qU8GtQPhoMyPg2BG4qCGn5ZflrO6VGP8riFwEp+vbpTaqKPkoN9QW mCgNdso35UGXwoPHFfu/LZ5icnIY8IKsCy0X1ZWpLobj27QFl/pBpTE/L0iY1sQa+zFX q/yA== X-Received: by 10.140.21.230 with SMTP id 93mr12550781qgl.81.1415984592172; Fri, 14 Nov 2014 09:03:12 -0800 (PST) MIME-Version: 1.0 Received: by 10.140.46.34 with HTTP; Fri, 14 Nov 2014 09:02:50 -0800 (PST) In-Reply-To: <20141113033317.GC28565@dastard> References: <1414775040-4051-1-git-send-email-eguan@redhat.com> <1414775040-4051-2-git-send-email-eguan@redhat.com> <20141113033317.GC28565@dastard> From: Steve French Date: Fri, 14 Nov 2014 11:02:50 -0600 Message-ID: Subject: Re: [PATCH v2 1/5] common: re-enable tests that require scratch dev on NFS To: Dave Chinner Cc: Eryu Guan , fstests@vger.kernel.org, "linux-nfs@vger.kernel.org" , "linux-cifs@vger.kernel.org" , Weston Andros Adamson Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, 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 On Wed, Nov 12, 2014 at 9:33 PM, Dave Chinner wrote: > On Wed, Nov 12, 2014 at 12:36:13PM -0600, Steve French wrote: >> On Fri, Oct 31, 2014 at 12:03 PM, Eryu Guan wrote: >> > This commit disables tests requires scratch dev running on NFS >> > >> > c041421 xfstests: stop special casing nfs and udf >> > >> > Now re-enable them to get a larger test coverage on NFS. >> > >> > Signed-off-by: Eryu Guan >> > --- >> > common/rc | 22 +++++++++++++++++++--- >> > 1 file changed, 19 insertions(+), 3 deletions(-) >> > >> > diff --git a/common/rc b/common/rc >> > index 747cf72..ae03712 100644 >> > --- a/common/rc >> > +++ b/common/rc >> > @@ -551,6 +551,14 @@ _mkfs_dev() >> > rm -f $tmp_dir.mkfserr $tmp_dir.mkfsstd >> > } >> > >> > +# remove all files in $SCRATCH_MNT, useful when testing on NFS/CIFS >> > +_scratch_cleanup_files() >> > +{ >> > + _scratch_mount >> > + rm -rf $SCRATCH_MNT/* >> > + _scratch_unmount >> > +} >> >> There should be a check to make sure SCRATCH_MNT exists before you >> wipe the whole disk .... >> >> so if no SCRATCH_MNT then this does rm -rf/* >> right ... (and wipes out your whole system ...) > > You can't get to that function until after all the checks that > SCRATCH_MNT exists. i.e. this happens during _scratch_mkfs, and that > is only called in tests after all the startup checks validate > devices and mounts exist. i.e. see common/config::get_next_config() Well, I reproduced it easily enough again today (after taking a snapshot of the VM) by simply running generic/120 against NFS with SCRATCH_MNT not specified in local.config Dros also ran into this problem. The patch below fixes it for me but it wasn't immediately obvious how to best return info to the user (ie print messages that make sense here - "echo" seems to be supressed in common/rc and notrun exits and logs it to a file but not to the screen in this case) sfrench@ubuntu:~/xfstests$ git diff -a diff --git a/common/rc b/common/rc index d5e3aff..866244b 100644 --- a/common/rc +++ b/common/rc @@ -555,6 +555,9 @@ _mkfs_dev() _scratch_cleanup_files() { _scratch_mount + if ! [ "$SCRATCH_MNT" ]; then + _notrun "this test requires a \$SCRATCH_MNT to be specified" + fi rm -rf $SCRATCH_MNT/* _scratch_unmount }