All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lukas Czerner <lczerner@redhat.com>
To: fstests@vger.kernel.org
Cc: xfs@oss.sgi.com, Lukas Czerner <lczerner@redhat.com>
Subject: [PATCH 2/2] xfstests: Check fs consistency on TEST_DEV only when needed
Date: Tue, 24 Jun 2014 15:36:54 +0200	[thread overview]
Message-ID: <1403617014-17870-2-git-send-email-lczerner@redhat.com> (raw)
In-Reply-To: <1403617014-17870-1-git-send-email-lczerner@redhat.com>

Currently we're checking file system consistency on TEST_DEV after every
successful test run even though the TEST_DEV might not even be used in
that test.

Fix it by checking for number of write io on TEST_DEV device before the
test and compare it with the value after the test.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 check     |  6 +++++-
 common/rc | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/check b/check
index 40f99d7..66d0f72 100755
--- a/check
+++ b/check
@@ -544,6 +544,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
 		rm -f core $seqres.notrun
 
 		scratch_atime=`stat -c %X $SCRATCH_DEV`
+		test_write_io=`_get_write_io_count $TEST_DEV`
 		start=`_wallclock`
 		$timestamp && echo -n "	["`date "+%T"`"]"
 		[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
@@ -626,7 +627,10 @@ for section in $HOST_OPTIONS_SECTIONS; do
 	    then
 		try="$try $seqnum"
 		n_try=`expr $n_try + 1`
-		_check_test_fs
+		write_io=`_get_write_io_count $TEST_DEV`
+		if [ -z $test_write_io ] || [ $write_io -ne $test_write_io ]; then
+			_check_test_fs
+		fi
 		atime=`stat -c %X $SCRATCH_DEV`
 		if [ $atime -ne $scratch_atime ]; then
 			_check_scratch_fs
diff --git a/common/rc b/common/rc
index 95030ae..83e8734 100644
--- a/common/rc
+++ b/common/rc
@@ -2165,6 +2165,17 @@ _scale_fsstress_args()
     echo $args
 }
 
+_get_write_io_count()
+{
+	if [ -z $1 ]; then
+		echo "Missing device argument for _get_write_io_count"
+		exit 1
+	fi
+	major_minor=$(printf "%d:%d" `stat -c "0x%t" $1` `stat -c "0x%T" $1`)
+	sync
+	cat /sys/dev/block/${major_minor}/stat 2> /dev/null | awk '{print $5}'
+}
+
 #
 # Return the logical block size if running on a block device,
 # else substitute the page size.
-- 
1.8.3.1


WARNING: multiple messages have this Message-ID (diff)
From: Lukas Czerner <lczerner@redhat.com>
To: fstests@vger.kernel.org
Cc: Lukas Czerner <lczerner@redhat.com>, xfs@oss.sgi.com
Subject: [PATCH 2/2] xfstests: Check fs consistency on TEST_DEV only when needed
Date: Tue, 24 Jun 2014 15:36:54 +0200	[thread overview]
Message-ID: <1403617014-17870-2-git-send-email-lczerner@redhat.com> (raw)
In-Reply-To: <1403617014-17870-1-git-send-email-lczerner@redhat.com>

Currently we're checking file system consistency on TEST_DEV after every
successful test run even though the TEST_DEV might not even be used in
that test.

Fix it by checking for number of write io on TEST_DEV device before the
test and compare it with the value after the test.

Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
 check     |  6 +++++-
 common/rc | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/check b/check
index 40f99d7..66d0f72 100755
--- a/check
+++ b/check
@@ -544,6 +544,7 @@ for section in $HOST_OPTIONS_SECTIONS; do
 		rm -f core $seqres.notrun
 
 		scratch_atime=`stat -c %X $SCRATCH_DEV`
+		test_write_io=`_get_write_io_count $TEST_DEV`
 		start=`_wallclock`
 		$timestamp && echo -n "	["`date "+%T"`"]"
 		[ ! -x $seq ] && chmod u+x $seq # ensure we can run it
@@ -626,7 +627,10 @@ for section in $HOST_OPTIONS_SECTIONS; do
 	    then
 		try="$try $seqnum"
 		n_try=`expr $n_try + 1`
-		_check_test_fs
+		write_io=`_get_write_io_count $TEST_DEV`
+		if [ -z $test_write_io ] || [ $write_io -ne $test_write_io ]; then
+			_check_test_fs
+		fi
 		atime=`stat -c %X $SCRATCH_DEV`
 		if [ $atime -ne $scratch_atime ]; then
 			_check_scratch_fs
diff --git a/common/rc b/common/rc
index 95030ae..83e8734 100644
--- a/common/rc
+++ b/common/rc
@@ -2165,6 +2165,17 @@ _scale_fsstress_args()
     echo $args
 }
 
+_get_write_io_count()
+{
+	if [ -z $1 ]; then
+		echo "Missing device argument for _get_write_io_count"
+		exit 1
+	fi
+	major_minor=$(printf "%d:%d" `stat -c "0x%t" $1` `stat -c "0x%T" $1`)
+	sync
+	cat /sys/dev/block/${major_minor}/stat 2> /dev/null | awk '{print $5}'
+}
+
 #
 # Return the logical block size if running on a block device,
 # else substitute the page size.
-- 
1.8.3.1

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  reply	other threads:[~2014-06-24 13:37 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 13:36 [PATCH 1/2] xfstests: Check the file system consistency on SCRATCH_DEV Lukas Czerner
2014-06-24 13:36 ` Lukas Czerner
2014-06-24 13:36 ` Lukas Czerner [this message]
2014-06-24 13:36   ` [PATCH 2/2] xfstests: Check fs consistency on TEST_DEV only when needed Lukas Czerner
2014-07-10  1:07   ` Dave Chinner
2014-07-10  1:07     ` Dave Chinner
2014-07-10  1:52     ` Eric Sandeen
2014-07-10  1:52       ` Eric Sandeen
2014-07-10  8:38     ` Lukáš Czerner
2014-07-10  8:38       ` Lukáš Czerner
2014-07-10 20:50       ` Dave Chinner
2014-07-10 20:50         ` Dave Chinner

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=1403617014-17870-2-git-send-email-lczerner@redhat.com \
    --to=lczerner@redhat.com \
    --cc=fstests@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.