From e604301e2605a152d8438f60d893ff29ed65d637 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Fri, 4 Nov 2016 11:04:39 +0100 Subject: [PATCH] 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 Reviewed-by: David Disseldorp Reviewed-by: Dave Chinner Signed-off-by: Eryu Guan --- README.config-sections | 6 ++++++ common/config | 9 +++++++++ common/rc | 21 ++++++++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/README.config-sections b/README.config-sections index 865ca932..df7c9292 100644 --- a/README.config-sections +++ b/README.config-sections @@ -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" diff --git a/common/config b/common/config index 168f46cd..59638d69 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 a84efe49..e3b54ecb 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 @@ -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 ;; -- 2.30.2