From eaad7e2c2b7a850eba88be5110846a88ab1145e8 Mon Sep 17 00:00:00 2001 From: Chris Horn Date: Wed, 20 Jul 2022 09:44:39 -0600 Subject: [PATCH] LU-15791 tests: Get health before removing drop rules lnet_health_post() can race with recovery pings, so we should wait to delete the drop rules until after we've gathered the health and resend values. Lustre-change: https://review.whamcloud.com/47998 Lustre-commit: 8caec97d5e89eefe250edb64e6f7ad61e12a9d71 Test-Parameters: trivial testlist=sanity-lnet Fixes: 79ab053562 ("LU-13569 lnet: Deprecate lnet_recovery_interval") Signed-off-by: Chris Horn Change-Id: Ia7595e015809f796cafcc40382d98ab66a708a49 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54439 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanity-lnet.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity-lnet.sh b/lustre/tests/sanity-lnet.sh index 8f05c69..615db63 100755 --- a/lustre/tests/sanity-lnet.sh +++ b/lustre/tests/sanity-lnet.sh @@ -1458,6 +1458,8 @@ function lnet_health_post() { restore_lnet_params + $LCTL net_drop_del -a + do_lnetctl peer set --health 1000 --all do_lnetctl net set --health 1000 --all @@ -1870,7 +1872,6 @@ test_209() { do_lnetctl discover ${RNIDS[0]} && error "Should have failed" - $LCTL net_drop_del -a lnet_health_post @@ -1890,7 +1891,6 @@ test_209() { do_lnetctl discover ${RNIDS[0]} && error "Should have failed" - $LCTL net_drop_del -a lnet_health_post -- 1.8.3.1