LU-10226 tests: properly check for fileset clear and error

Make sure fileset info on nodemap is cleared everywhere before
continuing test.
Also, properly exit on this error.

Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: I1d117ffef6c4a1002d3eba47a301e64830be4b4f
Reviewed-on: https://review.whamcloud.com/30037
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Stephan Thiell <sthiell@stanford.edu>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index db4f0aa..cdbee28 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -1892,10 +1892,11 @@ nodemap_exercise_fileset() {
        do_facet mgs $LCTL nodemap_set_fileset --name $nm --fileset \'\' ||
                error "unable to delete fileset info on $nm nodemap"
        wait_update_facet mgs "$LCTL get_param nodemap.${nm}.fileset" \
-                         "nodemap.${nm}.fileset="
+                         "nodemap.${nm}.fileset=" ||
+               error "fileset info still not cleared on $nm nodemap"
        do_facet mgs $LCTL set_param -P nodemap.${nm}.fileset=\'\' ||
                error "unable to reset fileset info on $nm nodemap"
-       wait_nm_sync $nm fileset
+       wait_nm_sync $nm fileset "nodemap.${nm}.fileset="
 
        # re-mount client
        zconf_umount_clients ${clients_arr[0]} $MOUNT ||
@@ -1904,8 +1905,10 @@ nodemap_exercise_fileset() {
                error "unable to remount client ${clients_arr[0]}"
 
        # test mount point content
-       do_node ${clients_arr[0]} test -d $MOUNT/$subdir ||
-               (ls $MOUNT ; error "fileset not cleared on $nm nodemap")
+       if ! $(do_node ${clients_arr[0]} test -d $MOUNT/$subdir); then
+               ls $MOUNT
+               error "fileset not cleared on $nm nodemap"
+       fi
 
        # back to non-nodemap setup
        if $SHARED_KEY; then