Commit a3ac68a0 authored by Kirk Webb's avatar Kirk Webb

up the timeout in vnode_setup for the benefit of plab (10 minutes) and

remove debugging flag from libdb.py
parent 06447655
......@@ -5,13 +5,13 @@
#
import sys
sys.path.append("@prefix@/lib")
import os
import pwd
import MySQLdb
# XXX: inherit!
debug = 1
from libtestbed import *
__dbName = "@TBDBNAME@"
__dbQueryMaxtries = 1
......
......@@ -5,13 +5,13 @@
#
import sys
sys.path.append("@prefix@/lib")
import os
import pwd
import MySQLdb
# XXX: inherit!
debug = 1
from libtestbed import *
__dbName = "@TBDBNAME@"
__dbQueryMaxtries = 1
......
......@@ -49,7 +49,7 @@ my $killmode = 0;
my $dbuid;
my $MAX_CHILDREN = 8;
my $CHILD_TIMEOUT = 120; # Two minutes
my $CHILD_TIMEOUT = 600; # Ten minutes - plab needs a LOOOOONNNGG TIME....
#
# Load the Testbed support stuff.
......@@ -321,7 +321,9 @@ while (1) {
$UID = 0;
if ($plab && $mode eq "setup") {
if (TBForkCmd("$TB/sbin/plabnode alloc $pid $eid $vnode", 1)) {
if (TBForkCmd("$TB/sbin/plabnode alloc ".
($force ? "-f" : "").
" $pid $eid $vnode", 1)) {
print STDERR "*** $0:\n" .
" Plab node allocation failed\n";
# Should check DB state instead.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment