From 38ea9326eeb6eeadb44cd6716d94d0f3382e8004 Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Tue, 24 Sep 2019 14:50:29 +0200 Subject: [PATCH] LU-12778 tests: give time to apply nodemap As nodemap definitions can need time before they are taken into account, retry several times before declaring the nodemap is not updated. Test-Parameters: trivial testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec Test-Parameters: trivial testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec Test-Parameters: trivial testlist=sanity-sec,sanity-sec,sanity-sec,sanity-sec Signed-off-by: Sebastien Buisson Change-Id: I632bd100ee62e3604aed3aaabc826e7a32287234 Reviewed-on: https://review.whamcloud.com/36280 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Emoly Liu Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity-sec.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index a268ab1..b77e1ab 100755 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -219,7 +219,6 @@ run_test 4 "set supplementary group ===============" create_nodemaps() { local i - local out local rc squash_id default 99 0 @@ -236,9 +235,10 @@ create_nodemaps() { return $rc fi - out=$(do_facet mgs $LCTL get_param nodemap.$csum.id) - ## This needs to return zero if the following statement is 1 - [[ $(echo $out | grep -c $csum) == 0 ]] && return 1 + wait_update_facet --verbose mgs \ + "$LCTL get_param nodemap.$csum.id 2>/dev/null | \ + grep -c $csum || true" 1 30 || + return 1 done for (( i = 0; i < NODEMAP_COUNT; i++ )); do local csum=${HOSTNAME_CHECKSUM}_${i} @@ -250,7 +250,6 @@ create_nodemaps() { delete_nodemaps() { local i - local out for ((i = 0; i < NODEMAP_COUNT; i++)); do local csum=${HOSTNAME_CHECKSUM}_${i} @@ -260,8 +259,10 @@ delete_nodemaps() { return 3 fi - out=$(do_facet mgs $LCTL get_param nodemap.$csum.id 2>/dev/null) - [[ $(echo $out | grep -c $csum) != 0 ]] && return 1 + wait_update_facet --verbose mgs \ + "$LCTL get_param nodemap.$csum.id 2>/dev/null | \ + grep -c $csum || true" 0 30 || + return 1 done for (( i = 0; i < NODEMAP_COUNT; i++ )); do local csum=${HOSTNAME_CHECKSUM}_${i} -- 1.8.3.1