LU-11522 tests: sanity-sec/27 unable to remount client

test_27() defect: test expects that lustre root is mounted on
$MOUNT which is not true if t-f runs witn FILESET set.

Patch fixes the test to have lustre root mounted before test
starts and restores the FILESET mount in the test cleanup.

Test-Parameters: trivial testlist=sanity-sec
Signed-off-by: Elena Gryaznova <c17455@cray.com>
Cray-bug-id: LUS-6560
Change-Id: I00cf50e00ed96d55552f010b5766a8bdab75a200
Reviewed-on: https://review.whamcloud.com/33389
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Alexandr Boyko <c17825@cray.com>
Reviewed-by: Sergey Cheremencev <c17829@cray.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index fbdcaae..9ee4e65 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -1156,6 +1156,12 @@ fops_test_setup() {
 # fileset test directory needs to be initialized on a privileged client
 fileset_test_setup() {
        local nm=$1
 # fileset test directory needs to be initialized on a privileged client
 fileset_test_setup() {
        local nm=$1

+
+       if [ -n "$FILESET" -a -z "$SKIP_FILESET" ]; then
+               cleanup_mount $MOUNT
+               FILESET="" zconf_mount_clients $CLIENTS $MOUNT
+       fi
+

        local admin=$(do_facet mgs $LCTL get_param -n \
                nodemap.${nm}.admin_nodemap)
        local trust=$(do_facet mgs $LCTL get_param -n \
        local admin=$(do_facet mgs $LCTL get_param -n \
                nodemap.${nm}.admin_nodemap)
        local trust=$(do_facet mgs $LCTL get_param -n \


@@ -1223,6 +1229,10 @@ fileset_test_cleanup() {
 
        wait_nm_sync $nm admin_nodemap
        wait_nm_sync $nm trusted_nodemap
 
        wait_nm_sync $nm admin_nodemap
        wait_nm_sync $nm trusted_nodemap

+       if [ -n "$FILESET" -a -z "$SKIP_FILESET" ]; then
+               cleanup_mount $MOUNT
+               zconf_mount_clients $CLIENTS $MOUNT
+       fi

 }
 
 do_create_delete() {
 }
 
 do_create_delete() {