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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 AD56FC433B4 for ; Sun, 25 Apr 2021 15:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7D30961350 for ; Sun, 25 Apr 2021 15:42:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230293AbhDYPmv (ORCPT ); Sun, 25 Apr 2021 11:42:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:47740 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbhDYPmv (ORCPT ); Sun, 25 Apr 2021 11:42:51 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 49CBF61168; Sun, 25 Apr 2021 15:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1619365331; bh=Sp4Kxi5ammKhQYxtwqlw6nuGrojHpxYdZBCI31t0Seo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FUyvOCdJpwLYH26NCMG7WojNXe7UlVI91QMnfl/Wqt9Ul5hpXfi+U+43Ixuz98uDl 5qaaKHUKjRMl7K0pp58M7JkaStBkv5DNcf9SECq5ocz9KxDtnVWtBTsVbKroeX/+jV XrgTwE80IQCUJfCILhJgNXgOay2rZfgBuZXWErgQbTAFqssExlXJnkE9x9c7gsenYt MXugZoAxa/PyD4OgZUQig5jp7o7PlH1PYBoGgnxSXuEslSuQyJoz7owlU8PuxF/U32 ocyPJj9+lFnkldGfkAcu6nwxN52/8srn5KBhwOsVRtj6lSU1ZXW2qt/53mw7BqaRYX /srXmjRNrnBuw== Date: Sun, 25 Apr 2021 08:42:10 -0700 From: "Darrick J. Wong" To: Eryu Guan Cc: guaneryu@gmail.com, linux-xfs@vger.kernel.org, fstests@vger.kernel.org Subject: Re: [PATCH 4/4] xfs: test upgrading filesystem to bigtime Message-ID: <20210425154210.GY3122264@magnolia> References: <161896458140.776452.9583732658582318883.stgit@magnolia> <161896460627.776452.15178871770338402214.stgit@magnolia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org On Sun, Apr 25, 2021 at 03:21:23PM +0800, Eryu Guan wrote: > On Tue, Apr 20, 2021 at 05:23:26PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > Test that we can upgrade an existing filesystem to use bigtime. > > > > Signed-off-by: Darrick J. Wong > > --- > > common/xfs | 16 ++++++ > > tests/xfs/908 | 117 ++++++++++++++++++++++++++++++++++++++++++ > > tests/xfs/908.out | 29 ++++++++++ > > tests/xfs/909 | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > > tests/xfs/909.out | 6 ++ > > I saw the quota test failed as below, is that expected? I was testing > with v5.12-rc7 kernel and latest xfsprogs from for-next branch. > > > Running xfs_repair to upgrade filesystem. > Adding large timestamp support to filesystem. > FEATURES: BIGTIME:YES > -grace2 expiry is in range > -grace2 expiry after remount is in range > +grace2 expiry has value of 18446744073076532766 > +grace2 expiry is NOT in range 7956915737 .. 7956915747 > +grace2 expiry after remount has value of 18446744073076532768 > +grace2 expiry after remount is NOT in range 7956915737 .. 7956915747 I think you need a version of quota-tools with commit 16b60cb9e315ed; v4.06 should do. I'll make a note of that in xfs/909 and resubmit. --D > Thanks, > Eryu > > P.S. I've applied the first 3 patches. > > > 6 files changed, 319 insertions(+) > > create mode 100755 tests/xfs/908 > > create mode 100644 tests/xfs/908.out > > create mode 100755 tests/xfs/909 > > create mode 100644 tests/xfs/909.out > > > > > > diff --git a/common/xfs b/common/xfs > > index cb6a1978..253a31e5 100644 > > --- a/common/xfs > > +++ b/common/xfs > > @@ -1184,3 +1184,19 @@ _xfs_timestamp_range() > > awk '{printf("%s %s", $1, $2);}' > > fi > > } > > + > > +# Require that the scratch device exists, that mkfs can format with bigtime > > +# enabled, that the kernel can mount such a filesystem, and that xfs_info > > +# advertises the presence of that feature. > > +_require_scratch_xfs_bigtime() > > +{ > > + _require_scratch > > + > > + _scratch_mkfs -m bigtime=1 &>/dev/null || \ > > + _notrun "mkfs.xfs doesn't support bigtime feature" > > + _try_scratch_mount || \ > > + _notrun "kernel doesn't support xfs bigtime feature" > > + $XFS_INFO_PROG "$SCRATCH_MNT" | grep -q -w "bigtime=1" || \ > > + _notrun "bigtime feature not advertised on mount?" > > + _scratch_unmount > > +} > > diff --git a/tests/xfs/908 b/tests/xfs/908 > > new file mode 100755 > > index 00000000..004a8563 > > --- /dev/null > > +++ b/tests/xfs/908 > > @@ -0,0 +1,117 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0-or-later > > +# Copyright (c) 2021 Oracle. All Rights Reserved. > > +# > > +# FS QA Test No. 908 > > +# > > +# Check that we can upgrade a filesystem to support bigtime and that inode > > +# timestamps work properly after the upgrade. > > + > > +seq=`basename $0` > > +seqres=$RESULT_DIR/$seq > > +echo "QA output created by $seq" > > + > > +here=`pwd` > > +tmp=/tmp/$$ > > +status=1 # failure is the default! > > +trap "_cleanup; exit \$status" 0 1 2 3 15 > > + > > +_cleanup() > > +{ > > + cd / > > + rm -f $tmp.* > > +} > > + > > +# get standard environment, filters and checks > > +. ./common/rc > > +. ./common/filter > > + > > +# real QA test starts here > > +_supported_fs xfs > > +_require_command "$XFS_ADMIN_PROG" "xfs_admin" > > +_require_scratch_xfs_bigtime > > +_require_xfs_repair_upgrade bigtime > > + > > +date --date='Jan 1 00:00:00 UTC 2040' > /dev/null 2>&1 || \ > > + _notrun "Userspace does not support dates past 2038." > > + > > +rm -f $seqres.full > > + > > +# Make sure we can't upgrade a V4 filesystem > > +_scratch_mkfs -m crc=0 >> $seqres.full > > +_scratch_xfs_admin -O bigtime=1 2>> $seqres.full > > +_check_scratch_xfs_features BIGTIME > > + > > +# Make sure we're required to specify a feature status > > +_scratch_mkfs -m crc=1,bigtime=0,inobtcount=0 >> $seqres.full > > +_scratch_xfs_admin -O bigtime 2>> $seqres.full > > + > > +# Can we add bigtime and inobtcount at the same time? > > +_scratch_mkfs -m crc=1,bigtime=0,inobtcount=0 >> $seqres.full > > +_scratch_xfs_admin -O bigtime=1,inobtcount=1 2>> $seqres.full > > + > > +# Format V5 filesystem without bigtime support and populate it > > +_scratch_mkfs -m crc=1,bigtime=0 >> $seqres.full > > +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > > +_scratch_mount >> $seqres.full > > + > > +touch -d 'Jan 9 19:19:19 UTC 1999' $SCRATCH_MNT/a > > +touch -d 'Jan 9 19:19:19 UTC 1999' $SCRATCH_MNT/b > > +ls -la $SCRATCH_MNT/* >> $seqres.full > > + > > +echo before upgrade: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +_scratch_unmount > > +_check_scratch_fs > > + > > +# Now upgrade to bigtime support > > +_scratch_xfs_admin -O bigtime=1 2>> $seqres.full > > +_check_scratch_xfs_features BIGTIME > > +_check_scratch_fs > > +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > > + > > +# Mount again, look at our files > > +_scratch_mount >> $seqres.full > > +ls -la $SCRATCH_MNT/* >> $seqres.full > > + > > +echo after upgrade: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +# Bump one of the timestamps but stay under 2038 > > +touch -d 'Jan 10 19:19:19 UTC 1999' $SCRATCH_MNT/a > > + > > +echo after upgrade and bump: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +_scratch_cycle_mount > > + > > +# Did the bumped timestamp survive the remount? > > +ls -la $SCRATCH_MNT/* >> $seqres.full > > + > > +echo after upgrade, bump, and remount: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +# Modify the other timestamp to stretch beyond 2038 > > +touch -d 'Feb 22 22:22:22 UTC 2222' $SCRATCH_MNT/b > > + > > +echo after upgrade and extension: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +_scratch_cycle_mount > > + > > +# Did the timestamp survive the remount? > > +ls -la $SCRATCH_MNT/* >> $seqres.full > > + > > +echo after upgrade, extension, and remount: > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/a > > +TZ=UTC stat -c '%Y' $SCRATCH_MNT/b > > + > > +# success, all done > > +status=0 > > +exit > > diff --git a/tests/xfs/908.out b/tests/xfs/908.out > > new file mode 100644 > > index 00000000..5e05854d > > --- /dev/null > > +++ b/tests/xfs/908.out > > @@ -0,0 +1,29 @@ > > +QA output created by 908 > > +Running xfs_repair to upgrade filesystem. > > +Large timestamp feature only supported on V5 filesystems. > > +FEATURES: BIGTIME:NO > > +Running xfs_repair to upgrade filesystem. > > +Running xfs_repair to upgrade filesystem. > > +Adding inode btree counts to filesystem. > > +Adding large timestamp support to filesystem. > > +before upgrade: > > +915909559 > > +915909559 > > +Running xfs_repair to upgrade filesystem. > > +Adding large timestamp support to filesystem. > > +FEATURES: BIGTIME:YES > > +after upgrade: > > +915909559 > > +915909559 > > +after upgrade and bump: > > +915995959 > > +915909559 > > +after upgrade, bump, and remount: > > +915995959 > > +915909559 > > +after upgrade and extension: > > +915995959 > > +7956915742 > > +after upgrade, extension, and remount: > > +915995959 > > +7956915742 > > diff --git a/tests/xfs/909 b/tests/xfs/909 > > new file mode 100755 > > index 00000000..66587aa7 > > --- /dev/null > > +++ b/tests/xfs/909 > > @@ -0,0 +1,149 @@ > > +#! /bin/bash > > +# SPDX-License-Identifier: GPL-2.0-or-later > > +# Copyright (c) 2021 Oracle. All Rights Reserved. > > +# > > +# FS QA Test No. 909 > > +# > > +# Check that we can upgrade a filesystem to support bigtime and that quota > > +# timers work properly after the upgrade. > > + > > +seq=`basename $0` > > +seqres=$RESULT_DIR/$seq > > +echo "QA output created by $seq" > > + > > +here=`pwd` > > +tmp=/tmp/$$ > > +status=1 # failure is the default! > > +trap "_cleanup; exit \$status" 0 1 2 3 15 > > + > > +_cleanup() > > +{ > > + cd / > > + rm -f $tmp.* > > +} > > + > > +# get standard environment, filters and checks > > +. ./common/rc > > +. ./common/filter > > +. ./common/quota > > + > > +# real QA test starts here > > +_supported_fs xfs > > +_require_command "$XFS_ADMIN_PROG" "xfs_admin" > > +_require_quota > > +_require_scratch_xfs_bigtime > > +_require_xfs_repair_upgrade bigtime > > + > > +date --date='Jan 1 00:00:00 UTC 2040' > /dev/null 2>&1 || \ > > + _notrun "Userspace does not support dates past 2038." > > + > > +rm -f $seqres.full > > + > > +# Format V5 filesystem without bigtime support and populate it > > +_scratch_mkfs -m crc=1,bigtime=0 >> $seqres.full > > +_qmount_option "usrquota" > > +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > > +_scratch_mount >> $seqres.full > > + > > +# Force the block counters for uid 1 and 2 above zero > > +_pwrite_byte 0x61 0 64k $SCRATCH_MNT/a >> $seqres.full > > +_pwrite_byte 0x61 0 64k $SCRATCH_MNT/b >> $seqres.full > > +sync > > +chown 1 $SCRATCH_MNT/a > > +chown 2 $SCRATCH_MNT/b > > + > > +# Set quota limits on uid 1 before upgrading > > +$XFS_QUOTA_PROG -x -c 'limit -u bsoft=12k bhard=1m 1' $SCRATCH_MNT > > + > > +# Make sure the grace period is at /some/ point in the future. We have to > > +# use bc because not all bashes can handle integer comparisons with 64-bit > > +# numbers. > > +repquota -upn $SCRATCH_MNT > $tmp.repquota > > +cat $tmp.repquota >> $seqres.full > > +grace="$(cat $tmp.repquota | grep '^#1' | awk '{print $6}')" > > +now="$(date +%s)" > > +res="$(echo "${grace} > ${now}" | $BC_PROG)" > > +test $res -eq 1 || echo "Expected timer expiry (${grace}) to be after now (${now})." > > + > > +_scratch_unmount > > + > > +# Now upgrade to bigtime support > > +_scratch_xfs_admin -O bigtime=1 2>> $seqres.full > > +_check_scratch_xfs_features BIGTIME > > +_check_scratch_fs > > +_scratch_xfs_db -c 'version' -c 'sb 0' -c 'p' >> $seqres.full > > + > > +# Mount again, see if our quota timer survived > > +_scratch_mount > > + > > +# Set a very generous grace period and quota limits on uid 2 after upgrading > > +$XFS_QUOTA_PROG -x -c 'timer -u -b -d 2147483647' $SCRATCH_MNT > > +$XFS_QUOTA_PROG -x -c 'limit -u bsoft=10000 bhard=150000 2' $SCRATCH_MNT > > + > > +# Query the grace periods to see if they got set properly after the upgrade. > > +repquota -upn $SCRATCH_MNT > $tmp.repquota > > +cat $tmp.repquota >> $seqres.full > > +grace1="$(repquota -upn $SCRATCH_MNT | grep '^#1' | awk '{print $6}')" > > +grace2="$(repquota -upn $SCRATCH_MNT | grep '^#2' | awk '{print $6}')" > > +now="$(date +%s)" > > + > > +# Make sure that uid 1's expiration is in the future... > > +res1="$(echo "${grace} > ${now}" | $BC_PROG)" > > +test "${res1}" -eq 1 || echo "Expected uid 1 expiry (${grace1}) to be after now (${now})." > > + > > +# ...and that uid 2's expiration is after uid 1's... > > +res2="$(echo "${grace2} > ${grace1}" | $BC_PROG)" > > +test "${res2}" -eq 1 || echo "Expected uid 2 expiry (${grace2}) to be after uid 1 (${grace1})." > > + > > +# ...and that uid 2's expiration is after 2038 if right now is far enough > > +# past 1970 that our generous grace period would provide for that. > > +res3="$(echo "(${now} < 100) || (${grace2} > 2147483648)" | $BC_PROG)" > > +test "${res3}" -eq 1 || echo "Expected uid 2 expiry (${grace2}) to be after 2038." > > + > > +_scratch_cycle_mount > > + > > +# Query the grace periods to see if they survived a remount. > > +repquota -upn $SCRATCH_MNT > $tmp.repquota > > +cat $tmp.repquota >> $seqres.full > > +grace1="$(repquota -upn $SCRATCH_MNT | grep '^#1' | awk '{print $6}')" > > +grace2="$(repquota -upn $SCRATCH_MNT | grep '^#2' | awk '{print $6}')" > > +now="$(date +%s)" > > + > > +# Make sure that uid 1's expiration is in the future... > > +res1="$(echo "${grace} > ${now}" | $BC_PROG)" > > +test "${res1}" -eq 1 || echo "Expected uid 1 expiry (${grace1}) to be after now (${now})." > > + > > +# ...and that uid 2's expiration is after uid 1's... > > +res2="$(echo "${grace2} > ${grace1}" | $BC_PROG)" > > +test "${res2}" -eq 1 || echo "Expected uid 2 expiry (${grace2}) to be after uid 1 (${grace1})." > > + > > +# ...and that uid 2's expiration is after 2038 if right now is far enough > > +# past 1970 that our generous grace period would provide for that. > > +res3="$(echo "(${now} < 100) || (${grace2} > 2147483648)" | $BC_PROG)" > > +test "${res3}" -eq 1 || echo "Expected uid 2 expiry (${grace2}) to be after 2038." > > + > > +# Now try setting uid 2's expiration to Feb 22 22:22:22 UTC 2222 > > +new_expiry=$(date -d 'Feb 22 22:22:22 UTC 2222' +%s) > > +now=$(date +%s) > > +test $now -ge $new_expiry && \ > > + echo "Now is after February 2222? Expect problems." > > +expiry_delta=$((new_expiry - now)) > > + > > +echo "setting expiration to $new_expiry - $now = $expiry_delta" >> $seqres.full > > +$XFS_QUOTA_PROG -x -c "timer -u $expiry_delta 2" -c 'report' $SCRATCH_MNT >> $seqres.full > > + > > +# Did we get an expiration within 5s of the target range? > > +grace2="$(repquota -upn $SCRATCH_MNT | grep '^#2' | awk '{print $6}')" > > +echo "grace2 is $grace2" >> $seqres.full > > +_within_tolerance "grace2 expiry" $grace2 $new_expiry 5 -v > > + > > +_scratch_cycle_mount > > + > > +# ...and is it still within 5s after a remount? > > +grace2="$(repquota -upn $SCRATCH_MNT | grep '^#2' | awk '{print $6}')" > > +echo "grace2 is $grace2" >> $seqres.full > > +_within_tolerance "grace2 expiry after remount" $grace2 $new_expiry 5 -v > > + > > +# success, all done > > +status=0 > > +exit > > diff --git a/tests/xfs/909.out b/tests/xfs/909.out > > new file mode 100644 > > index 00000000..72bf2416 > > --- /dev/null > > +++ b/tests/xfs/909.out > > @@ -0,0 +1,6 @@ > > +QA output created by 909 > > +Running xfs_repair to upgrade filesystem. > > +Adding large timestamp support to filesystem. > > +FEATURES: BIGTIME:YES > > +grace2 expiry is in range > > +grace2 expiry after remount is in range > > diff --git a/tests/xfs/group b/tests/xfs/group > > index b4e29bab..49bc4016 100644 > > --- a/tests/xfs/group > > +++ b/tests/xfs/group > > @@ -526,5 +526,7 @@ > > 768 auto quick repair > > 770 auto repair > > 773 auto quick repair > > +908 auto quick bigtime > > +909 auto quick bigtime quota > > 910 auto quick inobtcount > > 911 auto quick bigtime