fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Zorro Lang <zlang@redhat.com>
To: fstests@vger.kernel.org
Subject: Re: [PATCH 02/24] generic/60[01]: fix test failure when setting new grace limit
Date: Tue, 15 Sep 2020 20:55:59 +0800	[thread overview]
Message-ID: <20200915125558.GS2937@dhcp-12-102.nay.redhat.com> (raw)
In-Reply-To: <160013418837.2923511.12713913160160876814.stgit@magnolia>

On Mon, Sep 14, 2020 at 06:43:08PM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
> 
> The setquota command can extend a quota grace period by a certain number
> of seconds.  The extension is provided as a number of seconds relative
> to right now.  However, if the system clock increments the seconds count
> after this test assigns $now but before setquota gets called, the test
> will fail because $get and $set will be off by that 1 second.  Allow for
> that.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---

Good to me,
Reviewed-by: Zorro Lang <zlang@redhat.com>

>  tests/generic/600 |    4 +++-
>  tests/generic/601 |    4 +++-
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/tests/generic/600 b/tests/generic/600
> index 7ea0d6c2..42e4ee55 100755
> --- a/tests/generic/600
> +++ b/tests/generic/600
> @@ -60,7 +60,9 @@ let set=now+100
>  setquota -T -u $qa_user 0 100 $SCRATCH_MNT 2>&1 | grep -v "^setquota"
>  get=`repquota -up $SCRATCH_MNT | grep  "^$qa_user" | awk '{print $NF}'`
>  
> -if [ "$get" != "$set" ]; then
> +# Either the new expiry must match; or be one second after the set time, to
> +# deal with the seconds counter incrementing.
> +if [ "$get" != "$set" ] && [ "$get" -ne "$((set + 1))" ]; then
>  	echo "set grace to $set but got grace $get"
>  fi
>  
> diff --git a/tests/generic/601 b/tests/generic/601
> index 1baa6a90..b412ee8a 100755
> --- a/tests/generic/601
> +++ b/tests/generic/601
> @@ -71,7 +71,9 @@ $XFS_QUOTA_PROG -x -c "timer -u -i 100 $qa_user" $SCRATCH_MNT
>  # raw ("since epoch") grace expiry
>  get=`repquota -up $SCRATCH_MNT | grep  "^$qa_user" | awk '{print $NF}'`
>  
> -if [ "$get" != "$set" ]; then
> +# Either the new expiry must match; or be one second after the set time, to
> +# deal with the seconds counter incrementing.
> +if [ "$get" != "$set" ] && [ "$get" -ne "$((set + 1))" ]; then
>  	echo "set grace to $set but got grace $get"
>  fi
>  
> 


  reply	other threads:[~2020-09-15 12:44 UTC|newest]

Thread overview: 87+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15  1:42 [PATCH 00/24] fstests: tons of random fixes Darrick J. Wong
2020-09-15  1:43 ` [PATCH 01/24] xfs/331: don't run this test if fallocate isn't supported Darrick J. Wong
2020-09-15 12:39   ` Zorro Lang
2020-09-17  7:50   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 02/24] generic/60[01]: fix test failure when setting new grace limit Darrick J. Wong
2020-09-15 12:55   ` Zorro Lang [this message]
2020-09-17  7:51   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 03/24] generic/607: don't break on filesystems that don't support FSGETXATTR on dirs Darrick J. Wong
2020-09-15 13:16   ` Zorro Lang
2020-09-17  1:41   ` Xiao Yang
2020-09-17  3:27     ` Darrick J. Wong
2020-09-17  3:43       ` Xiao Yang
2020-09-17  3:56         ` Darrick J. Wong
2020-09-17  7:52           ` Christoph Hellwig
2020-09-17 15:54             ` Darrick J. Wong
2020-09-17 16:02               ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 04/24] xfs: skip tests that rely on allocation behaviors of the data device Darrick J. Wong
2020-09-16  2:04   ` Zorro Lang
2020-09-17  7:53   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 05/24] xfs/031: make sure we don't set rtinherit=1 on mkfs Darrick J. Wong
2020-09-16  2:21   ` Zorro Lang
2020-09-17  7:53   ` Christoph Hellwig
2020-09-17 15:57     ` Darrick J. Wong
2020-09-17 16:01       ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 06/24] xfs: wrap xfs_db calls to the test device Darrick J. Wong
2020-09-16  2:25   ` Zorro Lang
2020-09-17  7:54   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 07/24] xfs/{111,137}: replace open-coded calls to repair with _scratch_xfs_repair Darrick J. Wong
2020-09-16  2:28   ` Zorro Lang
2020-09-17  7:54   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 08/24] xfs: replace open-coded calls to xfs_logprint with helpers Darrick J. Wong
2020-09-16  2:35   ` Zorro Lang
2020-09-17  7:54   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 09/24] xfs/070: add scratch log device options to direct repair invocation Darrick J. Wong
2020-09-16  2:42   ` Zorro Lang
2020-09-16  3:42     ` Darrick J. Wong
2020-09-16 11:25       ` Zorro Lang
2020-09-17  7:55   ` Christoph Hellwig
2020-09-15  1:43 ` [PATCH 10/24] xfs: add a _require_xfs_copy helper Darrick J. Wong
2020-09-16  3:29   ` Zorro Lang
2020-09-17  7:55   ` Christoph Hellwig
2020-09-15  1:44 ` [PATCH 11/24] overlay/{069,071}: fix undefined variables Darrick J. Wong
2020-09-15  8:48   ` Amir Goldstein
2020-09-15  1:44 ` [PATCH 12/24] overlay/020: make sure the system supports the required namespaces Darrick J. Wong
2020-09-15  8:46   ` Amir Goldstein
2020-09-15  1:44 ` [PATCH 13/24] generic/204: don't flood stdout with ENOSPC messages on an ENOSPC test Darrick J. Wong
2020-09-16  4:14   ` Zorro Lang
2020-09-17  7:56   ` Christoph Hellwig
2020-09-17 16:02     ` Darrick J. Wong
2020-09-15  1:44 ` [PATCH 14/24] common/xfs: extract minimum log size message from mkfs correctly Darrick J. Wong
2020-09-16  5:28   ` Zorro Lang
2020-09-17  7:56   ` Christoph Hellwig
2020-09-15  1:44 ` [PATCH 15/24] xfs/194: actually check if we got 512-byte blocks before proceeding Darrick J. Wong
2020-09-16 11:34   ` Zorro Lang
2020-09-16 21:07     ` Darrick J. Wong
2020-09-15  1:44 ` [PATCH 16/24] xfs/098: adapt to external log devices Darrick J. Wong
2020-09-16 11:36   ` Zorro Lang
2020-09-17  7:58   ` Christoph Hellwig
2020-09-15  1:44 ` [PATCH 17/24] xfs: refactor _xfs_check calls to the scratch device Darrick J. Wong
2020-09-16 11:39   ` Zorro Lang
2020-09-17  7:58   ` Christoph Hellwig
2020-09-17 16:03     ` Darrick J. Wong
2020-09-15  1:44 ` [PATCH 18/24] xfs/291: fix open-coded repair call to mdrestore'd fs image Darrick J. Wong
2020-09-16 11:41   ` Zorro Lang
2020-09-15  1:44 ` [PATCH 19/24] xfs/424: disable external devices Darrick J. Wong
2020-09-16 11:48   ` Zorro Lang
2020-09-17  7:59   ` Christoph Hellwig
2020-09-15  1:45 ` [PATCH 20/24] xfs/449: fix xfs info report output if realtime device specified Darrick J. Wong
2020-09-16 11:50   ` Zorro Lang
2020-09-17  7:59   ` Christoph Hellwig
2020-09-15  1:45 ` [PATCH 21/24] common/rc: teach _scratch_mkfs_sized to set a size on an xfs realtime volume Darrick J. Wong
2020-09-16 12:02   ` Zorro Lang
2020-09-17  8:00   ` Christoph Hellwig
2020-09-17 16:04     ` Darrick J. Wong
2020-09-18  2:08   ` [PATCH v2 " Darrick J. Wong
2020-09-15  1:45 ` [PATCH 22/24] xfs/141: run for longer with TIME_FACTOR Darrick J. Wong
2020-09-16 12:05   ` Zorro Lang
2020-09-17  8:01   ` Christoph Hellwig
2020-09-15  1:45 ` [PATCH 23/24] generic/204: sync before scrub hits EIO Darrick J. Wong
2020-09-16 12:09   ` Zorro Lang
2020-09-17  8:01   ` Christoph Hellwig
2020-09-15  1:45 ` [PATCH 24/24] check: try reloading modules Darrick J. Wong
2020-09-15  8:42   ` Amir Goldstein
2020-09-18  2:10 ` [PATCH 26/24] common: drop HOSTOS Darrick J. Wong
2020-09-18  2:11 ` [PATCH 27/24] common/rc: fix indentation in _scratch_mkfs_sized Darrick J. Wong
2020-09-19  5:13   ` Christoph Hellwig
     [not found] ` <20200918020936.GJ7954@magnolia>
2020-09-19  5:13   ` [PATCH 25/24] common: kill _supported_os Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200915125558.GS2937@dhcp-12-102.nay.redhat.com \
    --to=zlang@redhat.com \
    --cc=fstests@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).