From: grev <grev>
Date: Fri, 15 May 2009 13:21:54 +0000 (+0000)
Subject: b=19380
X-Git-Tag: v1_8_0_110~2
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=913b58ea2129a9c9a2be97ffa6476a565284463e;p=fs%2Flustre-release.git

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
--- 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