* [PATCH 0/2 xfstests] Two improvements for xfstests @ 2010-07-21 16:50 Jan Kara 2010-07-21 16:50 ` [PATCH 1/2] Provide generic function for checking quota usage Jan Kara 2010-07-21 16:50 ` [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch Jan Kara 0 siblings, 2 replies; 7+ messages in thread From: Jan Kara @ 2010-07-21 16:50 UTC (permalink / raw) To: xfs; +Cc: hch Hi, these two patches didn't seem to make it in the xfstests repository. Could someone please include them? The first patch makes quota tests work fine for XFS and the second one is just a minor generic improvement. Thanks. Honza _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] Provide generic function for checking quota usage 2010-07-21 16:50 [PATCH 0/2 xfstests] Two improvements for xfstests Jan Kara @ 2010-07-21 16:50 ` Jan Kara 2010-07-21 16:50 ` [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch Jan Kara 1 sibling, 0 replies; 7+ messages in thread From: Jan Kara @ 2010-07-21 16:50 UTC (permalink / raw) To: xfs; +Cc: hch, Jan Kara Provide generic function _check_quota_usage for checking whether quota usage matches the space used and use it in proper tests. Signed-off-by: Jan Kara <jack@suse.cz> --- 231 | 18 +++--------------- 231.out | 6 ++++++ 232 | 14 +------------- 232.out | 2 ++ 233 | 14 +------------- 233.out | 2 ++ common.quota | 36 ++++++++++++++++++++++++++++++++++++ 7 files changed, 51 insertions(+), 41 deletions(-) diff --git a/231 b/231 index ebbe11e..e499c9a 100755 --- a/231 +++ b/231 @@ -49,18 +49,6 @@ s,$SCRATCH_DEV,[SCR_DEV],; print;" } -check_usage() -{ - quotaon -f -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g $SCRATCH_MNT | grep -v "^root" | filter_scratch \ - >$tmp.orig - quotacheck -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g $SCRATCH_MNT | grep -v "^root" | filter_scratch \ - >$tmp.checked - quotaon -u -g $SCRATCH_MNT 2>/dev/null - diff $tmp.orig $tmp.checked -} - _fsx() { tasks=$1 @@ -104,7 +92,7 @@ if ! _fsx 1; then exit fi -if ! check_usage; then +if ! _check_quota_usage; then umount $SCRATCH_DEV 2>/dev/null status=1 exit @@ -116,7 +104,7 @@ if ! _fsx 4; then exit fi -if ! check_usage; then +if ! _check_quota_usage; then umount $SCRATCH_DEV 2>/dev/null status=1 exit @@ -130,7 +118,7 @@ if ! _fsx 1; then exit fi -if ! check_usage; then +if ! _check_quota_usage; then umount $SCRATCH_DEV 2>/dev/null status=1 exit diff --git a/231.out b/231.out index 2f2d072..ef264a9 100644 --- a/231.out +++ b/231.out @@ -1,10 +1,16 @@ QA output created by 231 === FSX Standard Mode, Memory Mapping, 1 Tasks === All operations completed A-OK! +Comparing user usage +Comparing group usage === FSX Standard Mode, Memory Mapping, 4 Tasks === All operations completed A-OK! All operations completed A-OK! All operations completed A-OK! All operations completed A-OK! +Comparing user usage +Comparing group usage === FSX Standard Mode, Memory Mapping, 1 Tasks === All operations completed A-OK! +Comparing user usage +Comparing group usage diff --git a/232 b/232 index cf4d25a..d5f99bd 100755 --- a/232 +++ b/232 @@ -46,18 +46,6 @@ s,$SCRATCH_DEV,[SCR_DEV],; print;" } -check_usage() -{ - quotaon -f -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | - sort >$tmp.orig - quotacheck -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | - sort >$tmp.checked - quotaon -u -g $SCRATCH_MNT 2>/dev/null - diff $tmp.orig $tmp.checked -} - _filter_num() { tee -a $here/$seq.full |\ @@ -104,7 +92,7 @@ if ! _fsstress; then exit fi -if ! check_usage; then +if ! _check_quota_usage; then umount $SCRATCH_DEV 2>/dev/null status=1 exit diff --git a/232.out b/232.out index 744192e..ef82a89 100644 --- a/232.out +++ b/232.out @@ -4,3 +4,5 @@ Testing fsstress fsstress -n 2000 -d outdir -p 7 seed = S +Comparing user usage +Comparing group usage diff --git a/233 b/233 index b967e0d..5060931 100755 --- a/233 +++ b/233 @@ -50,18 +50,6 @@ s,$SCRATCH_DEV,[SCR_DEV],; print;" } -check_usage() -{ - quotaon -f -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | - sort >$tmp.orig - quotacheck -u -g $SCRATCH_MNT 2>/dev/null - repquota -u -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | - sort >$tmp.checked - quotaon -u -g $SCRATCH_MNT 2>/dev/null - diff $tmp.orig $tmp.checked -} - _filter_num() { tee -a $here/$seq.full |\ @@ -113,7 +101,7 @@ if ! _fsstress; then exit fi -if ! check_usage; then +if ! _check_quota_usage; then umount $SCRATCH_DEV 2>/dev/null status=1 exit diff --git a/233.out b/233.out index 208910d..fa36ca3 100644 --- a/233.out +++ b/233.out @@ -4,3 +4,5 @@ Testing fsstress fsstress -z -f rmdir=20 -f link=10 -f creat=10 -f mkdir=10 -f unlink=20 -f symlink=10 -f rename=10 -f fsync=2 -f write=15 -f dwrite=15 -n 5000 -d outdir -p 7 seed = S +Comparing user usage +Comparing group usage diff --git a/common.quota b/common.quota index d32e285..655e34d 100644 --- a/common.quota +++ b/common.quota @@ -211,5 +211,41 @@ _qmount_option() echo "MOUNT_OPTIONS = $MOUNT_OPTIONS" >>$seq.full } +_check_quota_usage() +{ + # Sync to get delalloc to disk + sync + VFS_QUOTA=0 + if [ $FSTYP = "ext2" -o $FSTYP = "ext3" -o $FSTYP = "ext4" -o $FSTYP = "reiserfs" ]; then + VFS_QUOTA=1 + quotaon -f -u -g $SCRATCH_MNT 2>/dev/null + fi + repquota -u -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | + sort >$tmp.user.orig + repquota -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | + sort >$tmp.group.orig + if [ $VFS_QUOTA -eq 1 ]; then + quotacheck -u -g $SCRATCH_MNT 2>/dev/null + else + # use XFS method to force quotacheck + mount -o remount,noquota $SCRATCH_DEV + mount -o remount,usrquota,grpquota $SCRATCH_DEV + fi + repquota -u -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | + sort >$tmp.user.checked + repquota -g -n $SCRATCH_MNT | grep -v "^#0" | filter_scratch | + sort >$tmp.group.checked + if [ $VFS_QUOTA -eq 1 ]; then + quotaon -u -g $SCRATCH_MNT 2>/dev/null + fi + { + echo "Comparing user usage" + diff $tmp.user.orig $tmp.user.checked + } && { + echo "Comparing group usage" + diff $tmp.group.orig $tmp.group.checked + } +} + # make sure this script returns success /bin/true -- 1.6.4.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch 2010-07-21 16:50 [PATCH 0/2 xfstests] Two improvements for xfstests Jan Kara 2010-07-21 16:50 ` [PATCH 1/2] Provide generic function for checking quota usage Jan Kara @ 2010-07-21 16:50 ` Jan Kara 2010-07-21 16:54 ` Christoph Hellwig 1 sibling, 1 reply; 7+ messages in thread From: Jan Kara @ 2010-07-21 16:50 UTC (permalink / raw) To: xfs; +Cc: hch, Jan Kara --- common.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/common.rc b/common.rc index 6bf1e12..72997f9 100644 --- a/common.rc +++ b/common.rc @@ -703,6 +703,10 @@ _require_scratch() then _notrun "this test requires a valid \$SCRATCH_DEV" fi + if [ ! -d "$SCRATCH_MNT" ] + then + _notrun "this test requires a valid \$SCRATCH_MNT" + fi ;; esac -- 1.6.4.2 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch 2010-07-21 16:50 ` [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch Jan Kara @ 2010-07-21 16:54 ` Christoph Hellwig 2010-07-21 17:32 ` Jan Kara 0 siblings, 1 reply; 7+ messages in thread From: Christoph Hellwig @ 2010-07-21 16:54 UTC (permalink / raw) To: Jan Kara; +Cc: hch, xfs This one is missing a signoff. Once you add it I can apply the series and push it out. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch 2010-07-21 16:54 ` Christoph Hellwig @ 2010-07-21 17:32 ` Jan Kara 2010-07-21 17:35 ` Christoph Hellwig 0 siblings, 1 reply; 7+ messages in thread From: Jan Kara @ 2010-07-21 17:32 UTC (permalink / raw) To: Christoph Hellwig; +Cc: Jan Kara, xfs [-- Attachment #1: Type: text/plain, Size: 259 bytes --] On Wed 21-07-10 12:54:28, Christoph Hellwig wrote: > This one is missing a signoff. Once you add it I can apply the series > and push it out. Oops sorry. Attached is the patch including the signoff. Honza -- Jan Kara <jack@suse.cz> SUSE Labs, CR [-- Attachment #2: 0002-Add-test-for-correct-SCRATCH_MNT-into-_require_scrat.patch --] [-- Type: text/x-patch, Size: 683 bytes --] >From d72c11b63aa22c920b460a71d4384c2f39be6513 Mon Sep 17 00:00:00 2001 From: Jan Kara <jack@suse.cz> Date: Tue, 15 Jun 2010 10:54:12 +0200 Subject: [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch Signed-off-by: Jan Kara <jack@suse.cz> --- common.rc | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/common.rc b/common.rc index 6bf1e12..72997f9 100644 --- a/common.rc +++ b/common.rc @@ -703,6 +703,10 @@ _require_scratch() then _notrun "this test requires a valid \$SCRATCH_DEV" fi + if [ ! -d "$SCRATCH_MNT" ] + then + _notrun "this test requires a valid \$SCRATCH_MNT" + fi ;; esac -- 1.6.4.2 [-- Attachment #3: Type: text/plain, Size: 121 bytes --] _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch 2010-07-21 17:32 ` Jan Kara @ 2010-07-21 17:35 ` Christoph Hellwig 2010-07-21 17:55 ` Alex Elder 0 siblings, 1 reply; 7+ messages in thread From: Christoph Hellwig @ 2010-07-21 17:35 UTC (permalink / raw) To: Jan Kara; +Cc: Christoph Hellwig, xfs Thanks, I've pushed both patches out. _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch 2010-07-21 17:35 ` Christoph Hellwig @ 2010-07-21 17:55 ` Alex Elder 0 siblings, 0 replies; 7+ messages in thread From: Alex Elder @ 2010-07-21 17:55 UTC (permalink / raw) To: Christoph Hellwig; +Cc: Jan Kara, xfs On Wed, 2010-07-21 at 13:35 -0400, Christoph Hellwig wrote: > Thanks, I've pushed both patches out. And I'll pick them up and push them out to oss.sgi.com this week; I'm updating xfsprogs and xfstests. -Alex _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-07-21 17:52 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-07-21 16:50 [PATCH 0/2 xfstests] Two improvements for xfstests Jan Kara 2010-07-21 16:50 ` [PATCH 1/2] Provide generic function for checking quota usage Jan Kara 2010-07-21 16:50 ` [PATCH 2/2] Add test for correct $SCRATCH_MNT into _require_scratch Jan Kara 2010-07-21 16:54 ` Christoph Hellwig 2010-07-21 17:32 ` Jan Kara 2010-07-21 17:35 ` Christoph Hellwig 2010-07-21 17:55 ` Alex Elder
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox