From eae0f97355cf9a20066815b004716e4f148cec3d Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Fri, 10 Nov 2017 17:16:47 +0100 Subject: [PATCH] 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 Change-Id: I1d117ffef6c4a1002d3eba47a301e64830be4b4f Reviewed-on: https://review.whamcloud.com/30037 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Emoly Liu Reviewed-by: Stephan Thiell Reviewed-by: Oleg Drokin --- lustre/tests/sanity-sec.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index db4f0aa..cdbee28 100755 --- 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 -- 1.8.3.1