LU-10290 tests: properly set fileset with combined MGT/MDT

We need to make sure MDS receives updated fileset info from MGS.
In case of combined MGT/MDT, directly setting fileset on the node
will mask llog-based info retrieval mechanism.
This patch also removes sanity-sec test_27 from ALWAYS_EXCEPT.

Lustre-change: https://review.whamcloud.com/30293
Lustre-commit: 0dd5215a9e03aae0e01b93e1bd45ab6657af02a9

Test-Parameters: trivial testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I7f25f03a213833f15d082a871ac6368a0e11aa82
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Stephan Thiell <sthiell@stanford.edu>
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/31280
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index e3c7c07..67f18e8 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -7,8 +7,8 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-# bug number for skipped test: 19430 19967 19967
-ALWAYS_EXCEPT="                2     5     6    $SANITY_SEC_EXCEPT"
+# bug number for skipped test:
+ALWAYS_EXCEPT="              $SANITY_SEC_EXCEPT"
 if $SHARED_KEY; then
 # bug number for skipped test: 9145 9145 9671 9145 9145 9145 9145 9245
        ALWAYS_EXCEPT="        17   18   19   20   21   22   23   27 $ALWAYS_EXCEPT"
@@ -1857,8 +1857,10 @@ nodemap_exercise_fileset() {
        fileset_test_setup "$nm"
 
        # add fileset info to $nm nodemap
-       do_facet mgs $LCTL set_param nodemap.${nm}.fileset=/$subdir ||
+       if ! combined_mgs_mds; then
+           do_facet mgs $LCTL set_param nodemap.${nm}.fileset=/$subdir ||
                error "unable to add fileset info to $nm nodemap on MGS"
+       fi
        do_facet mgs $LCTL set_param -P nodemap.${nm}.fileset=/$subdir ||
               error "unable to add fileset info to $nm nodemap for servers"
        wait_nm_sync $nm fileset "nodemap.${nm}.fileset=/$subdir"