From b8d51c44f20c2a3decd4230b7ec656727ea813a1 Mon Sep 17 00:00:00 2001 From: Henri Doreau Date: Wed, 2 Sep 2015 10:55:40 +0200 Subject: [PATCH] LU-7072 tests: Fix and re-enable test 78 in sanityn Early NRS policy tunings can fail for the following reasons: - Policy not started (ENODEV) - Policy not fully initialized (EAGAIN) Make test_78 of sanityn handle both properly and re-enable it. Signed-off-by: Henri Doreau Change-Id: I1d68ad709d0ac1c8ee9dabebf565c786d7c904da Reviewed-on: http://review.whamcloud.com/16178 Reviewed-by: Andreas Dilger Tested-by: Jenkins Tested-by: Andreas Dilger --- lustre/tests/sanityn.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index ddb16fa..e29bdc2 100644 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -5,8 +5,6 @@ set -e ONLY=${ONLY:-"$*"} # bug number for skipped test: 3192 LU-1205 15528/3811 9977 15528/11549 18080 ALWAYS_EXCEPT=" 14b 18c 19 28 29 35 $SANITYN_EXCEPT" -# LU-7072 -ALWAYS_EXCEPT="78 $SANITYN_EXCEPT" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! SRCDIR=$(dirname $0) @@ -3093,8 +3091,12 @@ test_78() { #LU-6673 do_facet ost"$i" lctl set_param \ ost.OSS.*.nrs_orr_quantum=1 rc=$? - [ $rc -eq 0 -o $rc -eq 11 ] || - error "Expected set_param to return 0 or EAGAIN" + # Valid return codes are: + # 0: Tuning succeeded + # ENODEV: Policy is still stopped + # EAGAIN: Policy is being initialized + [ $rc -eq 0 -o $rc -eq 19 -o $rc -eq 11 ] || + error "Expected set_param to return 0|ENODEV|EAGAIN" done # Cleanup the ORR policy -- 1.8.3.1