Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-1422 cray: Cray platforms set the initial connection value to high
[fs/lustre-release.git]
/
lustre
/
tests
/
test-framework.sh
diff --git
a/lustre/tests/test-framework.sh
b/lustre/tests/test-framework.sh
index
06224f7
..
d3a27c9
100644
(file)
--- a/
lustre/tests/test-framework.sh
+++ b/
lustre/tests/test-framework.sh
@@
-1,5
+1,6
@@
#!/bin/bash
#!/bin/bash
-# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+# -*- mode: Bash; tab-width: 4; indent-tabs-mode: t; -*-
+# vim:shiftwidth=4:softtabstop=4:tabstop=4:
trap 'print_summary && touch $TF_FAIL && \
echo "test-framework exiting on error"' ERR
trap 'print_summary && touch $TF_FAIL && \
echo "test-framework exiting on error"' ERR
@@
-403,7
+404,11
@@
load_modules_local() {
load_module cmm/cmm
load_module osd-ldiskfs/osd_ldiskfs
load_module ost/ost
load_module cmm/cmm
load_module osd-ldiskfs/osd_ldiskfs
load_module ost/ost
- load_module obdfilter/obdfilter
+ if [ "x$USE_OFD" = "xyes" ]; then
+ load_module ofd/ofd
+ else
+ load_module obdfilter/obdfilter
+ fi
fi
fi
@@
-4118,10
+4123,7
@@
wait_import_state() {
# the value depends on configure options, and it is not stored in /proc.
# obd_support.h:
# #define CONNECTION_SWITCH_MIN 5U
# the value depends on configure options, and it is not stored in /proc.
# obd_support.h:
# #define CONNECTION_SWITCH_MIN 5U
-# #ifndef CRAY_XT3
# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20)
# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/20)
-# #else
-# #define INITIAL_CONNECT_TIMEOUT max(CONNECTION_SWITCH_MIN,obd_timeout/2)
request_timeout () {
local facet=$1
request_timeout () {
local facet=$1