From b1c3382b2306b37b39749ef86dae299f5998ba01 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Mon, 23 Mar 2020 16:23:57 +0100 Subject: [PATCH] LU-13156 tests: wait for nodemap update in sanity-selinux In sanity-selinux test_21a and test_21b, nodemaps are used to test SELinux status checking (sepol). We must wait for nodemap update on all MDS nodes before carrying out tests. Lustre-change: https://review.whamcloud.com/38034 Lustre-commit: f1761cbe6b1243edd7a69c68c401d7285f7f3b38 Test-Parameters: clientselinux mdscount=2 mdtcount=4 testlist=recovery-small,sanity-selinux env=ONLY="21 23",ONLY_REPEAT=80 Signed-off-by: Sebastien Buisson Change-Id: I363e2bec757efc199f7039f8af4bcb77e2a2a184 Reviewed-by: Andreas Dilger Reviewed-by: James Nunez Signed-off-by: Etienne AUJAMES Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50400 Tested-by: Maloo Tested-by: jenkins --- lustre/tests/sanity-selinux.sh | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/lustre/tests/sanity-selinux.sh b/lustre/tests/sanity-selinux.sh index 561184d..d0cc3f7 100755 --- a/lustre/tests/sanity-selinux.sh +++ b/lustre/tests/sanity-selinux.sh @@ -502,6 +502,7 @@ check_nodemap() { local nm=$1 local key=$2 local val=$3 + local facets="" local i if [ "$nm" == "active" ]; then @@ -509,17 +510,23 @@ check_nodemap() { else proc_param="$nm.$key" fi - is_sync=false - for i in $(seq 1 20); do - out=$(do_facet mds1 $LCTL get_param -n \ + # check all MDS nodes, in reverse order to privilege remote ones first + for i in $(seq $MDSCOUNT); do + facets="mds$i $facets" + done + for facet in $facets; do + is_sync=false + for i in {1..20}; do + out=$(do_facet $facet $LCTL get_param -n \ nodemap.$proc_param 2>/dev/null) - echo "On mds1, ${proc_param} = $out" - [ "$val" == "$out" ] && is_sync=true && break - sleep 1 + echo "On $facet, ${proc_param} = $out" + [ "$val" == "$out" ] && is_sync=true && break + sleep 1 + done + if ! $is_sync; then + error "$proc_param not updated on $facet after 20 secs" + fi done - if ! $is_sync; then - error "$proc_param not updated on mds1 after 20 secs" - fi } create_nodemap() { @@ -541,6 +548,7 @@ create_nodemap() { check_nodemap $nm admin_nodemap 1 check_nodemap $nm trusted_nodemap 1 + sleep 10 sepol=$(l_getsepol | cut -d':' -f2- | xargs) do_facet mgs $LCTL set_param nodemap.$nm.sepol="$sepol" do_facet mgs $LCTL set_param -P nodemap.$nm.sepol="$sepol" -- 1.8.3.1