From: James Simmons Date: Mon, 8 Dec 2014 15:59:59 +0000 (-0500) Subject: LU-5986 test: fix conflicting conf-sanity 83 test. X-Git-Tag: 2.6.92~82 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=feaeafe8186fafa4cb0c8180bd9746c4a7af809f LU-5986 test: fix conflicting conf-sanity 83 test. Patches for both LU-4119 and LU-5729 introduced test 83 to conf-sanity. The simple fix is to renumber the test from LU-4119 to test 84. Change-Id: Idca7c97daface6768a08f7ef7cbd00b601921a1e Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/12984 Reviewed-by: Andreas Dilger Tested-by: Jenkins Reviewed-by: Nathaniel Clark Reviewed-by: Jian Yu Tested-by: Maloo --- diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 51c12d9..bd951fd 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5243,7 +5243,7 @@ recovery_time_min() { echo $((2*$RECONNECT_DELAY_MAX)) } -test_83() { +test_84() { local facet=$SINGLEMDS local num=$(echo $facet | tr -d "mds") local dev=$(mdsdevname $num) @@ -5300,7 +5300,7 @@ test_83() { stop_ost2 stop_mds } -run_test 83 "check recovery_hard_time" +run_test 84 "check recovery_hard_time" if ! combined_mgs_mds ; then stop mgs