From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E4B4C43463 for ; Mon, 21 Sep 2020 00:55:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0A5972073A for ; Mon, 21 Sep 2020 00:55:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FiuoMToW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726156AbgIUAzp (ORCPT ); Sun, 20 Sep 2020 20:55:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726126AbgIUAzp (ORCPT ); Sun, 20 Sep 2020 20:55:45 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CE95C061755; Sun, 20 Sep 2020 17:55:45 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id 7so7464852pgm.11; Sun, 20 Sep 2020 17:55:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ygTGQtlvHxCxEH9uG0f8lrwshg3qNyL8NnJCyUolwZ4=; b=FiuoMToWvXmKp6vPksgDVFt70jLke6TEY2UUJkjqvgEcjIwOXdTPKpW5Q0YMBcD7MD UNfgr5Te/nPLAjzk41ZF0VzGb8MoVijhXMmHhmk4o43MRS7b0B4YWewCAWW9588EuErQ 45O7n1WMJZBzSRrsSaUqf1kNkEjDn1GVY6jOGMY3PhI1OleHifARfD2hi/hthwufA/kb oMTz/u+3v/xZ2ufcAq4YJ15QwE4Mcrr0Phk3pmSY8XH2sjKDa4yheL+cFGQIph13qdNV qQv48fULtIwFaSB1F4YgELPAHaeTFpkG6tzJOUJK1RISUfVa1YHK4QOisLBr/tbLqtQi YFAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ygTGQtlvHxCxEH9uG0f8lrwshg3qNyL8NnJCyUolwZ4=; b=ncTX6De8sR8ttpP+udvfseklesYEufb7VC0RU8oejVvzRQLg403SoYvZjZoHIeJKIg hn3QrCp5XDeZOrHq3sqDjKsZL4zyPfJZYVILNXMJmAzS7CtEjlFyHFl254p7TMoees6l yQd0EyOEnaTlhMThqAFW9eJiDmPE1vae8b3kva8EaJU/kmiLBbKI2j5txXcesnFWpWV9 bGgWMG7uPnJFLPtIrxzd9hkvl1avsjpvmhTm7uHif0fEcgZs0cgshCuHCJOaScgyNgGd SjVT+7kYMo68bmCc/se59lRI/kZPyURO9OsUIGQbow20KFNK/aAeeDkyY9QpiqQrL7sW q2jw== X-Gm-Message-State: AOAM530CWd3YckhCMSXVE7b0DYm3u2rFs8/gLr5jIQaNHKKkXaMudew6 h53bdzZUJs03fsES4Bi3RQP2eiOokWo/L93Y X-Google-Smtp-Source: ABdhPJxm3OUHHKpaGTW7HxbBkfLBOIcjXT+7Hv7zTS1bI9X9DB9AVa3U6Pk7v/2SQqhdUPUCkfoLzA== X-Received: by 2002:a63:5d07:: with SMTP id r7mr22631515pgb.440.1600649744266; Sun, 20 Sep 2020 17:55:44 -0700 (PDT) Received: from realwakka ([175.195.128.78]) by smtp.gmail.com with ESMTPSA id c68sm3887395pfc.31.2020.09.20.17.55.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Sep 2020 17:55:43 -0700 (PDT) Date: Mon, 21 Sep 2020 00:55:35 +0000 From: Sidong Yang To: Eryu Guan Cc: linux-btrfs@vger.kernel.org, fstests@vger.kernel.org, Qu Wenruo , Josef Bacik Subject: Re: [PATCH] btrfs/022: Add qgroup assign test Message-ID: <20200921005535.GA28122@realwakka> References: <20200920085753.277590-1-realwakka@gmail.com> <20200920172740.GQ3853@desktop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200920172740.GQ3853@desktop> Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Mon, Sep 21, 2020 at 01:27:40AM +0800, Eryu Guan wrote: > On Sun, Sep 20, 2020 at 08:57:53AM +0000, Sidong Yang wrote: > > The btrfs/022 test is basic test about qgroup. but it doesn't have > > test with qgroup assign function. This patch adds parent assign > > test. parent assign test make two subvolumes and a qgroup for assign. > > Assign two subvolumes with a qgroup and check that quota of group > > has same value with sum of two subvolumes. > > > > Signed-off-by: Sidong Yang > Hi Eryu. Thanks for review! > We usually don't add new test case to existing tests, as that may make a > PASSed test starting to FAIL, which looks like a regression. Okay, If then, is it okay for writing a new script for this? > > > --- > > tests/btrfs/022 | 40 ++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 40 insertions(+) > > > > diff --git a/tests/btrfs/022 b/tests/btrfs/022 > > index aaa27aaa..cafaa8b2 100755 > > --- a/tests/btrfs/022 > > +++ b/tests/btrfs/022 > > @@ -110,6 +110,40 @@ _limit_test_noexceed() > > [ $? -eq 0 ] || _fail "should have been allowed to write" > > } > > > > +#basic assign testing > > +_parent_assign_test() > > Local function names don't need to be prefixed with "_". okay, thanks. > > > +{ > > + echo "=== parent assign test ===" >> $seqres.full > > + _run_btrfs_util_prog subvolume create $SCRATCH_MNT/a > > The helpers based on run_check are not recommended, please just > open-coded btrfs subvolume command and filter the output when necessary. > j > > + _run_btrfs_util_prog quota enable $SCRATCH_MNT > > + subvolid_a=$(_btrfs_get_subvolid $SCRATCH_MNT a) > > + > > + _run_btrfs_util_prog subvolume create $SCRATCH_MNT/b > > + _run_btrfs_util_prog quota enable $SCRATCH_MNT > > + subvolid_b=$(_btrfs_get_subvolid $SCRATCH_MNT b) > > + > > + _run_btrfs_util_prog qgroup create 1/100 $SCRATCH_MNT > > + > > + _run_btrfs_util_prog qgroup assign 0/$subvolid_a 1/100 $SCRATCH_MNT > > + _run_btrfs_util_prog qgroup assign 0/$subvolid_b 1/100 $SCRATCH_MNT > > + > > + _ddt of=$SCRATCH_MNT/a/file bs=4M count=1 >> $seqres.full 2>&1 > > + _ddt of=$SCRATCH_MNT/b/file bs=4M count=1 >> $seqres.full 2>&1 > > + sync > > Just fsync the individule files if possible. Thanks. I'll fix it like this. sync $SCRATCH_MNT/b/file > > > > + > > + a_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid_a") > > + a_shared=$(echo $a_shared | awk '{ print $2 }' | tr -dc '0-9') > > $AWK_PROG Okay! awk -> $AWK_PROG > > > + > > + b_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "0/$subvolid_b") > > + b_shared=$(echo $b_shared | awk '{ print $2 }' | tr -dc '0-9') > > + sum=$(expr $b_shared + $a_shared) > > + > > + q_shared=$($BTRFS_UTIL_PROG qgroup show $units $SCRATCH_MNT | grep "1/100") > > + q_shared=$(echo $q_shared | awk '{ print $2 }' | tr -dc '0-9') > > + > > + [ $sum -eq $q_shared ] || _fail "shared values don't match" > > Print the actual number and expected number as well? Yes, you mean writing like this? echo "a_shared = $a_shared" >> $seqres.full echo "b_shared = $b_shared" >> $seqres.full echo "sum = $sum" >> $seqres.full echo "q_shared = $q_shared" >> $seqres.full and I'm just curious that we don't need to cleanup qgroup environment after testing finished? Thanks, Sidong > > Thanks, > Eryu > > > +} > > + > > units=`_btrfs_qgroup_units` > > > > _scratch_mkfs > /dev/null 2>&1 > > @@ -133,6 +167,12 @@ _check_scratch_fs > > _scratch_mkfs > /dev/null 2>&1 > > _scratch_mount > > _limit_test_noexceed > > +_scratch_unmount > > +_check_scratch_fs > > + > > +_scratch_mkfs > /dev/null 2>&1 > > +_scratch_mount > > +_parent_assign_test > > > > # success, all done > > echo "Silence is golden" > > -- > > 2.25.1