| Message ID | 20200721124630.3112-1-marcos@mpdesouza.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] btrfs: 210: Ignore output from "quota rescan" after "quota enable" | expand |
On Tue, Jul 21, 2020 at 2:09 PM Marcos Paulo de Souza <marcos@mpdesouza.com> wrote: > > From: Marcos Paulo de Souza <mpdesouza@suse.com> > > Command "quota enable" triggers a quota rescan, but it can finish quick > in some machines leading to the next command "quota rescan" to be able > to start scanning again, and then printing "quota rescan started" making > the test fail. > > In some machines this don't happen because the first rescan initiated by > "quota enable" is still running when "quota rescan" is executed, returning > -EINPROGRESS from ioctl BTRFS_IOC_QUOTA_RESCAN_STATUS and not printing the > message. > > Ignoring any output from "quota rescan" solves the issue in both cases, and > this is already being done by others tests as well. > > Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Reviewed-by: Filipe Manana <fdmanana@suse.com> Looks good now, thanks. > --- > Patch v1 can be found here: > https://www.spinics.net/lists/linux-btrfs/msg103177.html > > tests/btrfs/210 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/btrfs/210 b/tests/btrfs/210 > index daa76a87..13d1a87b 100755 > --- a/tests/btrfs/210 > +++ b/tests/btrfs/210 > @@ -46,7 +46,7 @@ _pwrite_byte 0xcd 0 16M "$SCRATCH_MNT/src/file" > /dev/null > # by qgroup > sync > $BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" > -$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null > $BTRFS_UTIL_PROG qgroup create 1/0 "$SCRATCH_MNT" > > # Create a snapshot with qgroup inherit > -- > 2.27.0 >
diff --git a/tests/btrfs/210 b/tests/btrfs/210 index daa76a87..13d1a87b 100755 --- a/tests/btrfs/210 +++ b/tests/btrfs/210 @@ -46,7 +46,7 @@ _pwrite_byte 0xcd 0 16M "$SCRATCH_MNT/src/file" > /dev/null # by qgroup sync $BTRFS_UTIL_PROG quota enable "$SCRATCH_MNT" -$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" +$BTRFS_UTIL_PROG quota rescan -w "$SCRATCH_MNT" > /dev/null $BTRFS_UTIL_PROG qgroup create 1/0 "$SCRATCH_MNT" # Create a snapshot with qgroup inherit