* [PATCH] common: add CephFS support
@ 2016-11-02 9:00 David Disseldorp
2016-11-02 22:17 ` Dave Chinner
0 siblings, 1 reply; 3+ messages in thread
From: David Disseldorp @ 2016-11-02 9:00 UTC (permalink / raw)
To: fstests; +Cc: Joao Eduardo Luis
From: Joao Eduardo Luis <joao@suse.de>
Add basic CephFS support. No new CephFS specific tests are included,
just basic enablement, with ./check now accepting a -ceph parameter.
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
---
README | 1 +
check | 2 ++
common/config | 9 +++++++++
common/rc | 33 +++++++++++++++++++++++++++++++++
4 files changed, 45 insertions(+)
diff --git a/README b/README
index bc2058d..b1cafe2 100644
--- a/README
+++ b/README
@@ -126,6 +126,7 @@ Running tests:
Running all the udf tests: ./check -udf -g udf
- for running nfs tests: ./check -nfs [test(s)]
- for running cifs/smb3 tests: ./check -cifs [test(s)]
+ - for running CephFS tests: ./check -ceph [test(s)]
- To randomize test order: ./check -r [test(s)]
diff --git a/check b/check
index 69341d8..adc2347 100755
--- a/check
+++ b/check
@@ -63,6 +63,7 @@ usage()
check options
-nfs test NFS
-cifs test CIFS
+ -ceph test CephFS
-overlay test overlay
-tmpfs test TMPFS
-l line mode diff
@@ -212,6 +213,7 @@ while [ $# -gt 0 ]; do
-cifs) FSTYP=cifs ;;
-overlay) FSTYP=overlay ;;
-tmpfs) FSTYP=tmpfs ;;
+ -ceph) FSTYP=ceph ;;
-g) group=$2 ; shift ;
GROUP_LIST="$GROUP_LIST ${group//,/ }"
diff --git a/common/config b/common/config
index 168f46c..59638d6 100644
--- a/common/config
+++ b/common/config
@@ -298,6 +298,9 @@ _mount_opts()
cifs)
export MOUNT_OPTIONS=$CIFS_MOUNT_OPTIONS
;;
+ ceph)
+ export MOUNT_OPTIONS=$CEPHFS_MOUNT_OPTIONS
+ ;;
overlay)
export MOUNT_OPTIONS=$OVERLAY_MOUNT_OPTIONS
;;
@@ -335,6 +338,9 @@ _test_mount_opts()
cifs)
export TEST_FS_MOUNT_OPTS=$CIFS_MOUNT_OPTIONS
;;
+ ceph)
+ export TEST_FS_MOUNT_OPTS=$CEPHFS_MOUNT_OPTIONS
+ ;;
*)
;;
esac
@@ -357,6 +363,9 @@ _mkfs_opts()
cifs)
export MKFS_OPTIONS=$CIFS_MKFS_OPTIONS
;;
+ ceph)
+ export MKFS_OPTIONS=$CEPHFS_MKFS_OPTIONS
+ ;;
reiserfs)
export MKFS_OPTIONS="$REISERFS_MKFS_OPTIONS -q"
;;
diff --git a/common/rc b/common/rc
index a84efe4..d057962 100644
--- a/common/rc
+++ b/common/rc
@@ -147,6 +147,8 @@ case "$FSTYP" in
;;
cifs)
;;
+ ceph)
+ ;;
overlay)
;;
reiser4)
@@ -705,6 +707,9 @@ _test_mkfs()
cifs)
# do nothing for cifs
;;
+ ceph)
+ # do nothing for ceph
+ ;;
overlay)
# do nothing for overlay
;;
@@ -791,6 +796,10 @@ _scratch_mkfs()
# avoid EEXIST caused by the leftover files created in previous runs
_scratch_cleanup_files
;;
+ ceph)
+ # Don't re-create CephFS, just remove all files
+ _scratch_cleanup_files
+ ;;
overlay)
# unable to re-create overlay, remove all files in $SCRATCH_MNT to
# avoid EEXIST caused by the leftover files created in previous runs
@@ -1499,6 +1508,15 @@ _require_scratch_nocheck()
_notrun "this test requires a valid \$SCRATCH_MNT"
fi
;;
+ ceph)
+ echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1
+ if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
+ _notrun "this test requires a valid \$SCRATCH_DEV"
+ fi
+ if [ ! -d "$SCRATCH_MNT" ]; then
+ _notrun "this test requires a valid \$SCRATCH_MNT"
+ fi
+ ;;
cifs)
echo $SCRATCH_DEV | grep -q "//" > /dev/null 2>&1
if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
@@ -1584,6 +1602,15 @@ _require_test()
_notrun "this test requires a valid \$TEST_DIR"
fi
;;
+ ceph)
+ echo $TEST_DEV | grep -q ":/" > /dev/null 2>&1
+ if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
+ _notrun "this test requires a valid \$TEST_DEV"
+ fi
+ if [ ! -d "$TEST_DIR" ]; then
+ _notrun "this test requires a valid \$TEST_DIR"
+ fi
+ ;;
cifs)
echo $TEST_DEV | grep -q "//" > /dev/null 2>&1
if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
@@ -2658,6 +2685,9 @@ _check_test_fs()
cifs)
# no way to check consistency for cifs
;;
+ ceph)
+ # no way to check consistency for CephFS
+ ;;
overlay)
# no way to check consistency for overlay
;;
@@ -2702,6 +2732,9 @@ _check_scratch_fs()
cifs)
# Don't know how to check a CIFS filesystem, yet.
;;
+ ceph)
+ # no way to check consistency for CephFS
+ ;;
overlay)
# no way to check consistency for overlay
;;
--
2.10.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] common: add CephFS support
2016-11-02 9:00 [PATCH] common: add CephFS support David Disseldorp
@ 2016-11-02 22:17 ` Dave Chinner
2016-11-03 11:49 ` David Disseldorp
0 siblings, 1 reply; 3+ messages in thread
From: Dave Chinner @ 2016-11-02 22:17 UTC (permalink / raw)
To: David Disseldorp; +Cc: fstests, Joao Eduardo Luis
On Wed, Nov 02, 2016 at 10:00:54AM +0100, David Disseldorp wrote:
> From: Joao Eduardo Luis <joao@suse.de>
>
> Add basic CephFS support. No new CephFS specific tests are included,
> just basic enablement, with ./check now accepting a -ceph parameter.
We don't add command line parameters to specify the filesystem
anymore if we can avoid it (they are legacy options, really).
Specifying FSTYP=ceph in the environment or config file should be
sufficient to do they right thing - does this work for ceph?
> @@ -1499,6 +1508,15 @@ _require_scratch_nocheck()
> _notrun "this test requires a valid \$SCRATCH_MNT"
> fi
> ;;
> + ceph)
> + echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1
> + if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
> + _notrun "this test requires a valid \$SCRATCH_DEV"
> + fi
> + if [ ! -d "$SCRATCH_MNT" ]; then
> + _notrun "this test requires a valid \$SCRATCH_MNT"
> + fi
> + ;;
This is the same check as for nfs*). Can you make those common?
> cifs)
> echo $SCRATCH_DEV | grep -q "//" > /dev/null 2>&1
> if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
> @@ -1584,6 +1602,15 @@ _require_test()
> _notrun "this test requires a valid \$TEST_DIR"
> fi
> ;;
> + ceph)
> + echo $TEST_DEV | grep -q ":/" > /dev/null 2>&1
> + if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
> + _notrun "this test requires a valid \$TEST_DEV"
> + fi
> + if [ ! -d "$TEST_DIR" ]; then
> + _notrun "this test requires a valid \$TEST_DIR"
> + fi
> + ;;
Same.
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] common: add CephFS support
2016-11-02 22:17 ` Dave Chinner
@ 2016-11-03 11:49 ` David Disseldorp
0 siblings, 0 replies; 3+ messages in thread
From: David Disseldorp @ 2016-11-03 11:49 UTC (permalink / raw)
To: Dave Chinner; +Cc: fstests, Joao Eduardo Luis
On Thu, 3 Nov 2016 09:17:55 +1100, Dave Chinner wrote:
> On Wed, Nov 02, 2016 at 10:00:54AM +0100, David Disseldorp wrote:
> > From: Joao Eduardo Luis <joao@suse.de>
> >
> > Add basic CephFS support. No new CephFS specific tests are included,
> > just basic enablement, with ./check now accepting a -ceph parameter.
>
> We don't add command line parameters to specify the filesystem
> anymore if we can avoid it (they are legacy options, really).
> Specifying FSTYP=ceph in the environment or config file should be
> sufficient to do they right thing - does this work for ceph?
Yes, seems to work okay for me.
>
> > @@ -1499,6 +1508,15 @@ _require_scratch_nocheck()
> > _notrun "this test requires a valid \$SCRATCH_MNT"
> > fi
> > ;;
> > + ceph)
> > + echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1
> > + if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
> > + _notrun "this test requires a valid \$SCRATCH_DEV"
> > + fi
> > + if [ ! -d "$SCRATCH_MNT" ]; then
> > + _notrun "this test requires a valid \$SCRATCH_MNT"
> > + fi
> > + ;;
>
> This is the same check as for nfs*). Can you make those common?
Sure, will fix and resend. Thanks for the feedback Dave.
Cheers, David
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-03 11:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-02 9:00 [PATCH] common: add CephFS support David Disseldorp
2016-11-02 22:17 ` Dave Chinner
2016-11-03 11:49 ` David Disseldorp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox