X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Ftest-framework.sh;h=816078ab23e5c9c24fc962b6409ac3ea9dd27780;hb=381604c5c45c7f7394185f434bb8ad1dd4ed88af;hp=d6d1ee1f04b7abf3573a461d002ce06ecc887e78;hpb=a7246f90052f0b38637d365b9743cafd56c89a9d;p=fs%2Flustre-release.git

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index d6d1ee1..816078a 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2281,7 +2281,7 @@ client_evicted() {
     ! client_up $1
 }
 
-client_reconnect() {
+client_reconnect_try() {
     uname -n >> $MOUNT/recon
     if [ -z "$CLIENTS" ]; then
         df $MOUNT; uname -n >> $MOUNT/recon
@@ -2294,6 +2294,14 @@ client_reconnect() {
     rm $MOUNT/recon
 }
 
+client_reconnect() {
+	# one client_reconnect_try call does not always do the job...
+	while true ; do
+		client_reconnect_try && break
+		sleep 1
+	done
+}
+
 affected_facets () {
     local facet=$1
 
@@ -4397,6 +4405,13 @@ lru_resize_disable()
     lctl set_param ldlm.namespaces.*$1*.lru_size $(default_lru_size)
 }
 
+flock_is_enabled()
+{
+	local RC=0
+	[ -z "$(mount | grep "$MOUNT.*flock" | grep -v noflock)" ] && RC=1
+	return $RC
+}
+
 pgcache_empty() {
     local FILE
     for FILE in `lctl get_param -N "llite.*.dump_page_cache"`; do