aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2022-04-25 17:14:50 -0400
committerZorro Lang <zlang@kernel.org>2022-04-27 02:54:00 +0800
commit5528f7843b1ad6f15a9d6ac050cfdd6ce5b229f9 (patch)
tree8093e593a9db3ddaed6fa59b8578bb21ccdd3de8
parent0fd8e26141f50aaba8c6d3e058149a499317e445 (diff)
downloadxfstests-dev-5528f7843b1ad6f15a9d6ac050cfdd6ce5b229f9.tar.gz
generic/681, generic/682: add debugging information to $seqreq.full
These two tests are checking whether a non-privileged user causing a block allocation while expanding a directory block when over quota will fail with an EDQUOT error. There are three reasons why this can fail. * Aa test bug, where if the file system is using cluster allocation (for example, ext4 bigalloc) the test doesn't add enough directory entries to actually force directory grwoth. * A file system bug, where the file system allocates blocks but for some reason isn't charging the space quota correctly (which currently seems to be the case in ext4 with fscrypt). * A file system bug, where the file system is correctly charging the space quota to the unprivileged user, but isn't failing the system call with EDQUOT. By adding some additional debugging information about whether directory has grown or not (in addition to the existing repquota output) to the the $seqres.full, it makes easier for the file system developer to disambiguate between these possibilities. It's cheap to do this, and it could save developer time when trying to root cause the failure. Signed-off-by: Theodore Ts'o <tytso@mit.edu> Cc: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rwxr-xr-xtests/generic/6814
-rwxr-xr-xtests/generic/6824
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/generic/681 b/tests/generic/681
index 2baae9f46b..090da795ce 100755
--- a/tests/generic/681
+++ b/tests/generic/681
@@ -50,6 +50,8 @@ echo "set up quota" >> $seqres.full
setquota -u $qa_user 0 "$((blocksize / 1024))" 0 0 $SCRATCH_MNT
chown $qa_user $scratchdir $scratchfile
repquota -upn $SCRATCH_MNT >> $seqres.full
+echo $(ls $scratchdir | wc -l) files in $scratchdir >> $seqres.full
+ls -sld $scratchdir >> $seqres.full
# Fail at appending the directory as qa_user to ensure quota enforcement works
echo "fail quota" >> $seqres.full
@@ -60,6 +62,8 @@ for ((i = 0; i < dirents; i++)); do
test "${PIPESTATUS[0]}" -ne 0 && break
done
repquota -upn $SCRATCH_MNT >> $seqres.full
+echo $(ls $scratchdir | wc -l) files in $scratchdir >> $seqres.full
+ls -sld $scratchdir >> $seqres.full
# success, all done
echo Silence is golden
diff --git a/tests/generic/682 b/tests/generic/682
index 31629a56a5..b4cd0cd9dd 100755
--- a/tests/generic/682
+++ b/tests/generic/682
@@ -51,6 +51,8 @@ echo "set up quota" >> $seqres.full
setquota -u $qa_user 0 "$((blocksize / 1024))" 0 0 $SCRATCH_MNT
chown $qa_user $scratchdir $scratchfile
repquota -upn $SCRATCH_MNT >> $seqres.full
+echo $(ls $scratchdir | wc -l) files in $scratchdir >> $seqres.full
+ls -sld $scratchdir >> $seqres.full
# Fail at renaming into the directory as qa_user to ensure quota enforcement
# works
@@ -64,6 +66,8 @@ for ((i = 0; i < dirents; i++)); do
test "${PIPESTATUS[0]}" -ne 0 && break
done
repquota -upn $SCRATCH_MNT >> $seqres.full
+echo $(ls $scratchdir | wc -l) files in $scratchdir >> $seqres.full
+ls -sld $scratchdir >> $seqres.full
# success, all done
echo Silence is golden