common: add CephFS support

Add basic CephFS support. No new CephFS specific tests are included,
just FSTYP="ceph" enablement.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Joao Eduardo Luis
2016-11-04 11:04:39 +01:00
committed by Eryu Guan
parent c52086226b
commit e604301e26
3 changed files with 33 additions and 3 deletions
+6
View File
@@ -115,3 +115,9 @@ FSTYP=xfs
[ext3_filesystem]
FSTYP=ext3
MOUNT_OPTIONS="-o noatime"
[cephfs]
TEST_DIR=/mnt/test
TEST_DEV=192.168.14.1:6789:/
TEST_FS_MOUNT_OPTS="-o name=admin,secret=AQDuEBtYKEYRINGSECRETriSC8YJGDZsQHcr7g=="
FSTYP="ceph"
+9
View File
@@ -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"
;;
+18 -3
View File
@@ -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
@@ -1490,7 +1499,7 @@ _reload_btrfs_ko()
_require_scratch_nocheck()
{
case "$FSTYP" in
nfs*)
nfs*|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"
@@ -1575,10 +1584,10 @@ _require_scratch()
_require_test()
{
case "$FSTYP" in
nfs*)
nfs*|ceph)
echo $TEST_DEV | grep -q ":/" > /dev/null 2>&1
if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
_notrun "this test requires a valid \$TEST_DIR"
_notrun "this test requires a valid \$TEST_DEV"
fi
if [ ! -d "$TEST_DIR" ]; then
_notrun "this test requires a valid \$TEST_DIR"
@@ -2658,6 +2667,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 +2714,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
;;