X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Flnet-selftest.sh;h=a1c525d22e24f488a2afbaa904031cee5527ffe2;hb=ef50ce8496e4ead67c795c9db11fa9c0d58ef844;hp=f42ed4fcd26e8b51760bca86ef643ac4ef97c979;hpb=5d37670e8507563db556879041c7992936aefa56;p=fs%2Flustre-release.git

diff --git a/lustre/tests/lnet-selftest.sh b/lustre/tests/lnet-selftest.sh
index f42ed4f..a1c525d 100755
--- a/lustre/tests/lnet-selftest.sh
+++ b/lustre/tests/lnet-selftest.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
 # vim:shiftwidth=4:softtabstop=4:tabstop=4:
 
@@ -11,7 +11,12 @@ init_logging
 #
 ALWAYS_EXCEPT="$ALWAYS_EXCEPT $LNET_SELFTEST_EXCEPT"
 
-[ x$LST = x ] &&  { skip_env "$0 : lst not found LST=$LST" && exit 0; }
+if [[ $MDSCOUNT -ge 2 ]]; then
+	#LU-4181
+	skip "Only run with single MDT for now" && exit
+fi
+
+[ x$LST = x ] && { skip_env "lst not found LST=$LST" && exit 0; }
 
 # FIXME: what is the reasonable value here?
 lst_LOOP=${lst_LOOP:-100000}
@@ -51,9 +56,14 @@ fi
 # 2) it's theoretically possible that lst tests congest comm paths so tightly
 # that mounted lustre wouldn't able to perform some of its background activities
 if is_mounted $MOUNT || is_mounted $MOUNT2; then
-    local_mode && CLIENTONLY=yes
-    stopall
-    RESTORE_MOUNT=yes
+	if local_mode; then
+		CLIENTONLY=yes
+		stopall
+	else
+		LOAD_MODULES_REMOTE=true
+		cleanupall
+	fi
+	RESTORE_MOUNT=yes
 fi
 
 build_test_filter
@@ -157,7 +167,7 @@ test_smoke () {
 }
 run_test smoke "lst regression test"
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 if [ "$RESTORE_MOUNT" = yes ]; then
     setupall
 fi