From bb22454d2203553f657f26e13d6bbeea66270a48 Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Tue, 17 Apr 2018 11:08:04 +0800 Subject: [PATCH] LU-10907 tests: improve nodemap_test_setup() Do wait_nm_sync() after modifying default.admin_nodemap, otherwise it might cause the latter sync to fail. Also, this patch checks the number of clients for sanity-sec.sh test_23a, 2 clients at least for nodemap c0 and c1. Test-Parameters: trivial testlist=sanity-sec Change-Id: I7c7d5929b2f2b5aaaa0e7e884fa296fdf3cc1b57 Signed-off-by: Emoly Liu Reviewed-on: https://review.whamcloud.com/32018 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Saurabh Tandan Reviewed-by: Oleg Drokin --- lustre/tests/sanity-sec.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 7e3d2e4..885ec84 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -1493,6 +1493,7 @@ nodemap_test_setup() { do_facet mgs $LCTL nodemap_modify --name default \ --property admin --value 1 + wait_nm_sync default admin_nodemap do_facet mgs $LCTL nodemap_modify --name default \ --property trusted --value 1 wait_nm_sync default trusted_nodemap @@ -1506,6 +1507,7 @@ nodemap_test_cleanup() { do_facet mgs $LCTL nodemap_modify --name default \ --property admin --value 0 + wait_nm_sync default admin_nodemap do_facet mgs $LCTL nodemap_modify --name default \ --property trusted --value 0 wait_nm_sync default trusted_nodemap @@ -1694,6 +1696,7 @@ nodemap_acl_test() { } test_23a() { + [ $num_clients -lt 2 ] && skip "Need 2 clients at least" && return nodemap_version_check || return 0 nodemap_test_setup -- 1.8.3.1