From: Elena Gryaznova <c17455@cray.com>
Date: Wed, 17 Oct 2018 14:07:18 +0000 (+0300)
Subject: LU-11522 tests: sanity-sec/27 unable to remount client
X-Git-Tag: 2.12.0-RC1~52
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=5f3b0966d4d42154e2d390292d4455fc70531e2d

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
--- 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
+
+	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 \
@@ -1223,6 +1229,10 @@ fileset_test_cleanup() {
 
 	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() {