From: Eric Mei <eric.mei@oracle.com>
Date: Mon, 8 Nov 2010 17:32:11 +0000 (-0700)
Subject: b=24001 fix conf-sanity 53.
X-Git-Tag: 2.0.56.0~29
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=7b9b7771af62c5c4f1f6dd40261183dd180eb74d;hp=1cb2b41a12176f30b0a36be75bec0e1253d8f3ef

b=24001 fix conf-sanity 53.

i=jian.yu
i=grev

threads_max and threads_min could be the same.
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 3ad57f5..cb74a5c 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -2386,27 +2386,26 @@ thread_sanity() {
         tmax=$(do_facet $facet "lctl get_param -n ${paramp}.threads_max" || echo 0)
         tstarted=$(do_facet $facet "lctl get_param -n ${paramp}.threads_started" || echo 0)
         lassert 23 "$msg (PDSH problems?)" '(($tstarted && $tmin && $tmax))' || return $?
-        lassert 24 "$msg" '(($tstarted >= $tmin && $tstarted <= tmax ))' || return $?
+        lassert 24 "$msg" '(($tstarted >= $tmin && $tstarted <= $tmax ))' || return $?
 
         # Check that we can lower min/max
         do_facet $facet "lctl set_param ${paramp}.threads_min=$((tmin - 1))"
-        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmax - 10))"
+        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmax - 1))"
         tmin2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_min" || echo 0)
         tmax2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_max" || echo 0)
-        lassert 25 "$msg" '(($tmin2 == ($tmin - 1) && $tmax2 == ($tmax -10)))' || return $?
+        lassert 25 "$msg" '(($tmin2 == ($tmin - 1) && $tmax2 == ($tmax -1)))' || return $?
 
         # Check that we can set min/max to the same value
-        do_facet $facet "lctl set_param ${paramp}.threads_min=$tmin"
-        do_facet $facet "lctl set_param ${paramp}.threads_max=$tmin"
+        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmin - 1))"
         tmin2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_min" || echo 0)
         tmax2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_max" || echo 0)
-        lassert 26 "$msg" '(($tmin2 == $tmin && $tmax2 == $tmin))' || return $?
+        lassert 26 "$msg" '(($tmin2 == ($tmin - 1) && $tmax2 == ($tmin - 1)))' || return $?
 
         # Check that we can't set max < min
-        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmin - 1))"
+        do_facet $facet "lctl set_param ${paramp}.threads_max=$((tmin - 2))"
         tmin2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_min" || echo 0)
         tmax2=$(do_facet $facet "lctl get_param -n ${paramp}.threads_max" || echo 0)
-        lassert 27 "$msg" '(($tmin <= $tmax2))' || return $?
+        lassert 27 "$msg" '(($tmin2 <= $tmax2))' || return $?
 
         # We need to ensure that we get the module options desired; to do this
         # we set LOAD_MODULES_REMOTE=true and we call setmodopts below.