X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=d516313efe5ca87d6f697836ee21cb9886e8ce2f;hp=190026d485331ed007507b88cdc0952c9f556f0b;hb=28806162c234a178365853a393aa401e180256e2;hpb=f0c1b06f2418d2016e23eb6e8277be85ca13fc53

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 190026d..d516313 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2068,6 +2068,7 @@ wait_mds_ost_sync () {
 	echo "Waiting for orphan cleanup..."
 	# MAX value includes time needed for MDS-OST reconnection
 	local MAX=$(( TIMEOUT * 2 ))
+	local WAIT_TIMEOUT=${1:-$MAX}
 	local WAIT=0
 	local new_wait=true
 	local list=$(comma_list $(mdts_nodes))
@@ -2080,7 +2081,9 @@ wait_mds_ost_sync () {
 		list=$(comma_list $(osts_nodes))
 		cmd="$LCTL get_param -n obdfilter.*.mds_sync"
 	fi
-	while [ $WAIT -lt $MAX ]; do
+
+	echo "wait $WAIT_TIMEOUT secs maximumly for $list mds-ost sync done."
+	while [ $WAIT -lt $WAIT_TIMEOUT ]; do
 		local -a sync=($(do_nodes $list "$cmd"))
 		local con=1
 		local i
@@ -2096,10 +2099,13 @@ wait_mds_ost_sync () {
 		done
 		sleep 2 # increase waiting time and cover statfs cache
 		[ ${con} -eq 1 ] && return 0
-		echo "Waiting $WAIT secs for $facet mds-ost sync done."
+		echo "Waiting $WAIT secs for $list $i mds-ost sync done."
 		WAIT=$((WAIT + 2))
 	done
-	echo "$facet recovery not done in $MAX sec. $STATUS"
+
+	# show which nodes are not finished.
+	do_nodes $list "$cmd"
+	echo "$facet recovery node $i not done in $WAIT_TIMEOUT sec. $STATUS"
 	return 1
 }