From: Jan Kara <jack@suse.cz>
To: xfs@oss.sgi.com
Cc: Eric Sandeen <sandeen@sandeen.net>, Jan Kara <jack@suse.cz>
Subject: [PATCH v2] Count journal size in test 289
Date: Wed, 20 Mar 2013 11:50:48 +0100 [thread overview]
Message-ID: <1363776648-14061-1-git-send-email-jack@suse.cz> (raw)
Test 289 ignored the fact that historically journal is not accounted as
fs overhead in ext3. For larger filesystems it is hidden in 1% tolerance
but for filesystems smaller than 12G the test fails. So make the
counting precise to work everywhere.
CC: Eric Sandeen <sandeen@sandeen.net>
Signed-off-by: Jan Kara <jack@suse.cz>
---
289 | 16 ++++++++++++----
common.filter | 15 +++++++++++++++
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/289 b/289
index b057c20..eb5c63b 100755
--- a/289
+++ b/289
@@ -59,10 +59,18 @@ TOTAL_BLOCKS=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
FREE_BLOCKS=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
| awk '/Free blocks:/{print $3}'`
-# nb: kernels today don't count journal blocks as overhead, but should.
-# For most filesystems this will still be within tolerance.
-# Overhead is all the blocks (already) used by the fs itself:
-OVERHEAD=$(($TOTAL_BLOCKS-$FREE_BLOCKS))
+# ext3 doesn't count journal blocks as overhead, ext4 does.
+if [ $FSTYP = "ext3" ]; then
+ JOURNAL_SIZE=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
+ | awk '/Journal size:/{print $3}' | _filter_size_to_bytes`
+ BLOCK_SIZE=`dumpe2fs -h $SCRATCH_DEV 2>/dev/null \
+ | awk '/Block size:/{print $3}'`
+ JOURNAL_BLOCKS=$(($JOURNAL_SIZE/$BLOCK_SIZE))
+else
+ JOURNAL_BLOCKS=0
+fi
+
+OVERHEAD=$(($TOTAL_BLOCKS-$FREE_BLOCKS-$JOURNAL_BLOCKS))
# bsddf|minixdf
# Set the behaviour for the statfs system call. The minixdf
diff --git a/common.filter b/common.filter
index f0f6076..fcd7589 100644
--- a/common.filter
+++ b/common.filter
@@ -229,5 +229,20 @@ _filter_spaces()
sed -e 's/ [ ]*/ /g'
}
+# Convert string read from stdin like 128K to bytes and print it to stdout
+_filter_size_to_bytes()
+{
+ read size
+ suffix=${size:${#size}-1}
+ mul=1
+ case $suffix in
+ K) mul=1024 ;;
+ M) mul=$((1024*1024)) ;;
+ G) mul=$((1024*1024*1024)) ;;
+ T) mul=$((1024*1024*1024*1024)) ;;
+ esac
+ echo $((${size:0:${#size}-1}*$mul))
+}
+
# make sure this script returns success
/bin/true
--
1.7.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2013-03-20 10:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-20 10:50 Jan Kara [this message]
2013-03-20 14:31 ` [PATCH v2] Count journal size in test 289 Eric Sandeen
2013-03-20 14:37 ` Rich Johnston
2013-03-20 16:00 ` Rich Johnston
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=1363776648-14061-1-git-send-email-jack@suse.cz \
--to=jack@suse.cz \
--cc=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/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