From: Richard Wareing <rwareing@fb.com>
To: fstests@vger.kernel.org
Cc: darrick.wong@oracle.com, eguan@redhat.com, linux-xfs@vger.kernel.org
Subject: [PATCH v3 1/3] xfs/realtime: Add require_no_realtime function
Date: Wed, 10 Jan 2018 19:08:59 -0800 [thread overview]
Message-ID: <20180111030901.1961285-2-rwareing@fb.com> (raw)
In-Reply-To: <20180111030901.1961285-1-rwareing@fb.com>
Some tests do not play well with realtime devices, in an effort to
produce a stable set of test which exercise the realtime code paths
we introduce a _require_no_realtime function to allow tests to opt
out of realtime subvolume test runs.
Signed-off-by: Richard Wareing <rwareing@fb.com>
---
Changes since v2:
* Fixed tests generic/409-411, _get_mount now honors $SCRATCH_OPTIONS
* tests/xfs/202 reverted, the test does indeed work with larger test
device
* Added comments explaining why _require_no_realtime was declared
Changes since v1:
* None
common/rc | 18 ++++++++++++++++--
tests/xfs/077 | 2 ++
tests/xfs/189 | 1 +
tests/xfs/284 | 2 ++
4 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/common/rc b/common/rc
index 9216efd..f5fe739 100644
--- a/common/rc
+++ b/common/rc
@@ -198,8 +198,14 @@ _mount()
_get_mount()
{
local mnt_point=${!#}
+ local mnt_dev=${@:(-2):1}
+ local scratch_opts=""
+ if [ "$mnt_dev" == "$SCRATCH_DEV" ]; then
+ _scratch_options mount
+ scratch_opts="$SCRATCH_OPTIONS"
+ fi
- _mount $*
+ _mount $scratch_opts $*
if [ $? -eq 0 ]; then
MOUNTED_POINT_STACK="$mnt_point $MOUNTED_POINT_STACK"
else
@@ -230,7 +236,7 @@ _clear_mount_stack()
_scratch_options()
{
- type=$1
+ local type=$1
SCRATCH_OPTIONS=""
if [ "$FSTYP" != "xfs" ]; then
@@ -1737,6 +1743,14 @@ _require_realtime()
_notrun "Realtime device required, skipped this test"
}
+# This test requires that a realtime subvolume is not in use
+#
+_require_no_realtime()
+{
+ [ -n "$SCRATCH_RTDEV" ] && \
+ _notrun "Test not compatible with realtime subvolumes, skipped this test"
+}
+
# this test requires that a specified command (executable) exists
# $1 - command, $2 - name for error message
#
diff --git a/tests/xfs/077 b/tests/xfs/077
index eba4f08..6d5ac1a 100755
--- a/tests/xfs/077
+++ b/tests/xfs/077
@@ -50,6 +50,8 @@ _cleanup()
_supported_fs xfs
_supported_os Linux
+# xfs_copy does not support realtime devices
+_require_no_realtime
_require_scratch
_require_xfs_crc
_require_meta_uuid
diff --git a/tests/xfs/189 b/tests/xfs/189
index 636f6f0..699eb3c 100755
--- a/tests/xfs/189
+++ b/tests/xfs/189
@@ -236,6 +236,7 @@ _putback_scratch_fstab()
_supported_fs xfs
_supported_os Linux
+_require_no_realtime
_require_scratch
_require_noattr2
diff --git a/tests/xfs/284 b/tests/xfs/284
index e3625fe..d0eb5bd 100755
--- a/tests/xfs/284
+++ b/tests/xfs/284
@@ -49,6 +49,8 @@ rm -f $seqres.full
# real QA test starts here
_supported_fs xfs
_supported_os Linux
+# xfs_copy does not support realtime devices
+_require_no_realtime
_require_test
_require_scratch
--
2.9.5
next prev parent reply other threads:[~2018-01-11 3:09 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 3:08 [PATCH v3 0/3] Fix/harden "quick" tests for realtime subvolumes Richard Wareing
2018-01-11 3:08 ` Richard Wareing [this message]
2018-01-11 4:10 ` [PATCH v3 1/3] xfs/realtime: Add require_no_realtime function Darrick J. Wong
2018-01-11 21:22 ` Richard Wareing
2018-01-11 3:09 ` [PATCH v3 2/3] xfs/realtime: Default rtinherit=1, add _require_no_rtinherit function Richard Wareing
2018-01-11 4:06 ` Darrick J. Wong
2018-01-11 21:27 ` Richard Wareing
2018-01-11 3:09 ` [PATCH v3 3/3] xfs/realtime: Fix direct invocations of xfs_repair Richard Wareing
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=20180111030901.1961285-2-rwareing@fb.com \
--to=rwareing@fb.com \
--cc=darrick.wong@oracle.com \
--cc=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/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.