b=19380

i=Johann
i=He.Huang
add local_nid_dist_zero=0 to LNETOPTS

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 8190428..0047ab2 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -180,6 +180,11 @@ load_modules() {
     [ -z "$LNETOPTS" -a "$MODPROBECONF" ] && \
         LNETOPTS=$(awk '/^options lnet/ { print $0}' $MODPROBECONF | sed 's/^options lnet //g')
     echo $LNETOPTS | grep -q "accept=all"  || LNETOPTS="$LNETOPTS accept=all";
+    # bug 19380
+    if [ "$NETTYPE" = "tcp" -o "$NETTYPE" = "o2ib" -o "$NETTYPE" = "ptl" ]; then
+        echo $LNETOPTS | grep -q "local_nid_dist_zero=0" ||
+        LNETOPTS="$LNETOPTS local_nid_dist_zero=0"
+    fi
     echo "lnet options: '$LNETOPTS'"
     # note that insmod will ignore anything in modprobe.conf
     load_module ../lnet/lnet/lnet $LNETOPTS