- increase testbed setup timeout

diff --git a/contrib/testbed_infiniband.conf b/contrib/testbed_infiniband.conf
index 5ca12a1a008409e0eb1d7ceb387fbc92872129f1..d05d60c9ade8737cc126ce0b2ffaff166f52bb94 100644 (file)
--- a/contrib/testbed_infiniband.conf
+++ b/contrib/testbed_infiniband.conf
@@ -4,11 +4,12 @@ PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24;
 HOSTNAME = localhost
 MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
-OVERLAY_TOPOLOGY = LINE
+OVERLAY_TOPOLOGY = 2D_TORUS
 OVERLAY_RANDOM_LINKS = 4000
 OPERATION_TIMEOUT = 45 s
 # LOG_FILE = /tmp/testbed.log
 #PREFIX = xterm -geometry 100x85 -T peer1 -e libtool --mode=execute gdb --args
+SETUP_TIMEOUT = 30m
 
 [fs]
 AUTOSTART = NO

diff --git a/src/nse/nse_infiniband.conf b/src/nse/nse_infiniband.conf
index bb956d5d17d4a0f3863f638b1766ecd00d416f05..046b31f119e53a117c0ee44cc7794a66444aaed6 100644 (file)
--- a/src/nse/nse_infiniband.conf
+++ b/src/nse/nse_infiniband.conf
@@ -6,11 +6,11 @@ AUTOSTART = NO
 PORT = 12113
 ACCEPT_FROM = 127.0.0.1; 10.6.0.0/16; 192.168.0.0/16;
 HOSTNAME = localhost
-MAX_PARALLEL_OPERATIONS = 250
+MAX_PARALLEL_OPERATIONS = 400
 OVERLAY_TOPOLOGY = 2D_TORUS
 OVERLAY_RANDOM_LINKS = 1000
 OPERATION_TIMEOUT = 45 s
-SETUP_TIMEOUT = 15m
+SETUP_TIMEOUT = 30m
 
 [nse]
 PORT = 12114