LU-11495 tests: zconf_mount_clients() fix to work with FILESET

If FILESET is set zconf_mount_clients() fails to mount clients
because of missing $mnt dir on the clients.

When FILESET is set the following tests are to be skipped:
- tests accessing .lustre directly
- tests involving lustre_rsync (which needs .lustre to do
  open by FID)
- tests involving copytool (lhsmtool_posix needs .lustre)
- tests taking use of llapi_open_by_fid (sanity.sh:test_405()
  ->swap_lock_test, sanity.sh:test_807()->llsom_sync)
- tests require Lustre root mounted on $MOUNT
  (sanity.sh:test_65n() needs root to test default layout
  inheritance)

Test-Parameters: trivial envdefinitions=FILESET=/subdir
Signed-off-by: Elena Gryaznova <c17455@cray.com>
Cray-bug-id: LUS-6546, LUS-6561
Reviewed-by: Vladimir Saveliev <c17830@cray.com>
Reviewed-by: Andrew Perepechko <c17827@cray.com>
Reviewed-by: Alexander Boyko <c17825@cray.com>
Change-Id: I68081fbff808abbaddb314e36283e09d151a81db
Reviewed-on: https://review.whamcloud.com/33338
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/lustre-rsync-test.sh b/lustre/tests/lustre-rsync-test.sh
index 9c8658d..e8fef19 100644 (file)
--- a/lustre/tests/lustre-rsync-test.sh
+++ b/lustre/tests/lustre-rsync-test.sh
@@ -33,6 +33,8 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+[ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
 check_and_setup_lustre
 
 DIR=${DIR:-$MOUNT}

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 2035603..60c19f1 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -26,6 +26,8 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
+[ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
 MULTIOP=${MULTIOP:-multiop}
 OPENFILE=${OPENFILE:-openfile}
 MMAP_CAT=${MMAP_CAT:-mmap_cat}

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 4456975..168c1b4 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -2127,6 +2127,8 @@ test_18a() {
 run_test 18a "Find out orphan OST-object and repair it (1)"
 
 test_18b() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        echo "#####"
        echo "The target MDT-object is lost. The LFSCK should re-create the"
        echo "MDT-object under .lustre/lost+found/MDTxxxx. The admin should"
@@ -2262,6 +2264,8 @@ test_18b() {
 run_test 18b "Find out orphan OST-object and repair it (2)"
 
 test_18c() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        echo "#####"
        echo "The target MDT-object is lost, and the OST-object FID is missing."
        echo "The LFSCK should re-create the MDT-object with new FID under the "
@@ -2487,6 +2491,8 @@ test_18d() {
 run_test 18d "Find out orphan OST-object and repair it (4)"
 
 test_18e() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        echo "#####"
        echo "The target MDT-object layout EA slot is occpuied by some new"
        echo "created OST-object when repair dangling reference case. Such"
@@ -2777,6 +2783,8 @@ test_18f() {
 run_test 18f "Skip the failed OST(s) when handle orphan OST-objects"
 
 test_18g() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        echo "#####"
        echo "The target MDT-object is lost, but related OI mapping is there"
        echo "The LFSCK should recreate the lost MDT-object without affected"
@@ -2990,6 +2998,7 @@ PATTERN_WITHOUT_HOLE="raid0"
 
 test_20a() {
        [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        echo "#####"
        echo "The target MDT-object and some of its OST-object are lost."
@@ -3329,6 +3338,7 @@ run_test 20a "Handle the orphan with dummy LOV EA slot properly"
 
 test_20b() {
        [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        echo "#####"
        echo "The target MDT-object and some of its OST-object are lost."
@@ -4011,6 +4021,7 @@ run_test 23c "LFSCK can repair dangling name entry (3)"
 
 test_24() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        echo "#####"
        echo "Two MDT-objects back reference the same name entry via their"
@@ -4221,6 +4232,8 @@ test_26b() {
 run_test 26b "LFSCK can add the missing remote name entry back to the namespace"
 
 test_27a() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        echo "#####"
        echo "The local parent referenced by the MDT-object linkEA is lost."
        echo "The namespace LFSCK will re-create the lost parent as orphan."
@@ -4274,6 +4287,7 @@ run_test 27a "LFSCK can recreate the lost local parent directory as orphan"
 
 test_27b() {
        [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" && return
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        echo "#####"
        echo "The remote parent referenced by the MDT-object linkEA is lost."
@@ -4604,6 +4618,7 @@ run_test 29c "verify linkEA size limitation"
 test_30() {
        [ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
                skip "ldiskfs only test" && return
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        echo "#####"
        echo "The namespace LFSCK will move the orphans from backend"

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index ffff7a0..f7dc22f 100644 (file)
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -354,6 +354,8 @@ test_0() {
 run_test 0 "Do not auto trigger OI scrub for non-backup/restore case"
 
 test_1a() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
+
        scrub_prep 0
        echo "start $SINGLEMDS without disabling OI scrub"
        scrub_start_mds 1 "$MOUNT_OPTS_SCRUB"

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 1cdbe3e..4ae7a1d 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -6752,6 +6752,7 @@ test_65m() {
 run_test 65m "normal user can't set filesystem default stripe"
 
 test_65n() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.12.50) ]] ||
                skip "Need MDS version at least 2.12.50"
        [[ $PARALLEL != "yes" ]] || skip "skip parallel run"
@@ -13063,6 +13064,7 @@ run_test 161c "check CL_RENME[UNLINK] changelog record flags"
 
 test_161d() {
        remote_mds_nodsh && skip "remote MDS with nodsh"
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
 
        local pid
        local fid
@@ -19052,6 +19054,7 @@ test_404() { # LU-6601
 run_test 404 "validate manual {de}activated works properly for OSPs"
 
 test_405() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [ $MDS1_VERSION -lt $(version_code 2.6.92) -o \
        [ $CLIENT_VERSION -lt $(version_code 2.6.99) ] &&
                skip "Layout swap lock is not supported"
@@ -20105,6 +20108,7 @@ test_806() {
 run_test 806 "Verify Lazy Size on MDS"
 
 test_807() {
+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"
        [ $MDS1_VERSION -lt $(version_code 2.11.52) ] &&
                skip "Need MDS version at least 2.11.52"
 

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 1e7a5b9..d2d2fc7 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2348,7 +2348,8 @@ zconf_mount_clients() {
        fi
 
        echo "Starting client $clients: $flags $opts $device $mnt"
-       if [ -n "$FILESET" -a ! -n "$SKIP_FILESET" ]; then
+       do_nodes $clients mkdir -p $mnt
+       if [ -n "$FILESET" -a -z "$SKIP_FILESET" ]; then
                if $GSS_SK && ($SK_UNIQUE_NM || $SK_S2S); then
                        # Mount with own nodemap key
                        local i=0