X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frecovery-random-scale.sh;h=23f6ee53f966d611cb6fe8b4cc3ae6c247a39ab6;hb=0ad54d59777366fba8ee61eaaa27b3060c91782f;hp=e63523eed173e9c040927da49f5e66550f42cc59;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/recovery-random-scale.sh b/lustre/tests/recovery-random-scale.sh
index e63523e..23f6ee5 100644
--- a/lustre/tests/recovery-random-scale.sh
+++ b/lustre/tests/recovery-random-scale.sh
@@ -52,8 +52,9 @@ SERVER_FAILOVER_PERIOD=${SERVER_FAILOVER_PERIOD:-$((60 * 10))} # 10 minutes
 
 MINSLEEP=${MINSLEEP:-120}
 REQFAIL_PERCENT=${REQFAIL_PERCENT:-3}    # bug17839 comment 62
-REQFAIL=${REQFAIL:-$((DURATION / SERVER_FAILOVER_PERIOD *
-                      REQFAIL_PERCENT / 100))}
+# round up the result of integer division: C=(A + (B - 1)) / B
+REQFAIL=${REQFAIL:-$(((DURATION * REQFAIL_PERCENT + (SERVER_FAILOVER_PERIOD *
+	100 - 1 )) / SERVER_FAILOVER_PERIOD / 100))}
 
 END_RUN_FILE=${END_RUN_FILE:-$SHARED_DIRECTORY/end_run_file}
 LOAD_PID_FILE=${LOAD_PID_FILE:-$TMP/client-load.pid}
@@ -100,13 +101,11 @@ Status: $result: rc=$rc"
     # stop the client loads
     stop_client_loads $NODES_TO_USE $LOAD_PID_FILE
 
-    if [ $rc -ne 0 ]; then
-        # we are interested in only on failed clients and servers
-        local failedclients=$(cat $END_RUN_FILE | grep -v $0)
-        # FIXME: need ostfailover-s nodes also for FLAVOR=OST
-        gather_logs $(comma_list $(osts_nodes) $(mdts_nodes) \
-                      $mdsfailover_HOST $failedclients)
-    fi
+	if [ $rc -ne 0 ]; then
+		# we are interested in only on failed clients and servers
+		local failedclients=$(cat $END_RUN_FILE | grep -v $0)
+		gather_logs $(comma_list $(all_server_nodes) $failedclients)
+	fi
 
     exit $rc
 }