From: adilger <adilger>
Date: Tue, 27 Nov 2007 00:30:46 +0000 (+0000)
Subject: Branch b1_6
X-Git-Tag: v1_8_0_110~956
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=c1f64852eb7db8bbbd758d23c6245d8c1f8a3ca3;p=fs%2Flustre-release.git

Branch b1_6
Skip swap-on-lustre test 68, it can deadlock on TCP due to inability to
allocate receive buffers.
b=14033
i=jay
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 72288af..5188f5f 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2853,9 +2853,12 @@ test_68() {
 	grep -q llite_lloop /proc/modules
 	[ $? -ne 0 ] && skip "can't find module llite_lloop" && return
 
-        MEMTOTAL=`meminfo MemTotal`
-        NR_BLOCKS=$((MEMTOTAL>>8))
-        [[ $NR_BLOCKS -le 2048 ]] && NR_BLOCKS=2048
+	[ -z "`$LCTL list_nids | grep -v tcp`" ] && \
+		skip "can't reliably test swap with TCP" && return
+
+	MEMTOTAL=`meminfo MemTotal`
+	NR_BLOCKS=$((MEMTOTAL>>8))
+	[[ $NR_BLOCKS -le 2048 ]] && NR_BLOCKS=2048
 
 	LLOOP=$TMP/lloop.`date +%s`.`date +%N`
 	dd if=/dev/zero of=$DIR/f68 bs=64k seek=$NR_BLOCKS count=1