Commit 931605fd authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Back out nalloc/nfree change. Wrong.

The problem is that "@TESTMODE@" is wrong! This becomes a string "0",
instead of the integer 0, and so "if ($TESTMODE)" breaks down.
parent d5126b72
...@@ -10,7 +10,6 @@ my $d = 0; ...@@ -10,7 +10,6 @@ my $d = 0;
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $DBNAME = "@TBDBNAME@"; my $DBNAME = "@TBDBNAME@";
my $TESTMODE = @TESTMODE@;
my $dbh = Mysql->connect("localhost",$DBNAME,"script","none"); my $dbh = Mysql->connect("localhost",$DBNAME,"script","none");
...@@ -102,7 +101,7 @@ $cmd = "unlock tables"; ...@@ -102,7 +101,7 @@ $cmd = "unlock tables";
$sth = $dbh->query($cmd) $sth = $dbh->query($cmd)
|| die("Locking error:\n$cmd\nError string is:".$dbh->errstr."\n"); || die("Locking error:\n$cmd\nError string is:".$dbh->errstr."\n");
if (! $TESTMODE && !$error && @nodes) { if (!$error && @nodes) {
my @conlist=(); my @conlist=();
my @sharks=(); my @sharks=();
......
...@@ -6,7 +6,6 @@ use Mysql; ...@@ -6,7 +6,6 @@ use Mysql;
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $DBNAME = "@TBDBNAME@"; my $DBNAME = "@TBDBNAME@";
my $TESTMODE = @TESTMODE@;
my $dbh = Mysql->connect("localhost",$DBNAME,"script","none"); my $dbh = Mysql->connect("localhost",$DBNAME,"script","none");
...@@ -237,7 +236,7 @@ if ( (@reloaded > 0) || (keys %reserves > 0) ) { ...@@ -237,7 +236,7 @@ if ( (@reloaded > 0) || (keys %reserves > 0) ) {
|| die("Locking error:\n$cmd\nError string is:".$dbh->errstr."\n"); || die("Locking error:\n$cmd\nError string is:".$dbh->errstr."\n");
} }
if (!$TESTMODE && @freed_nodes) { if (@freed_nodes) {
my @conlist=(); my @conlist=();
my @sharks=(); my @sharks=();
......
...@@ -4,27 +4,24 @@ tbsetup README ...@@ -4,27 +4,24 @@ tbsetup README
tbprerun tbprerun
Syntax: Syntax:
tbprerun [-nologfile] <pid> <eid> <ns-file> tbprerun <pid> <eid> <ns-file>
tbprerun takes a brand new experiment, checks the syntax of the tbprerun takes a brand new experiment, checks the syntax of the
ns-file, and then converts the ns-file into a virtual topology stored ns-file, and then converts the ns-file into a virtual topology stored
in the database. in the database.
-nologfile - Prevents creation of a logfile.
---------------------------------------------------------------------- ----------------------------------------------------------------------
tbswapin tbswapin
Syntax: Syntax:
tbswapin [-nologfile] <pid> <eid> tbswapin <pid> <eid>
tbswapin swaps an experiment in. Specifically it finds and allocates tbswapin swaps an experiment in. Specifically it finds and allocates
a set of resources and configures these resources to emulate the a set of resources and configures these resources to emulate the
desired experiment. As a part of this it configures the physical desired experiment. As a part of this it configures the physical
state in the DB. state in the DB.
-nologfile - Prevents creation/appending of a logfile.
Exit Codes: Exit Codes:
...@@ -56,14 +53,13 @@ I.e. ...@@ -56,14 +53,13 @@ I.e.
tbswapout tbswapout
Syntax: Syntax:
tbswapout [-nologfile] [-force] <pid> <eid> tbswapout [-force] <pid> <eid>
tbswapout is the inverse of tbswapin. It tears down the physical tbswapout is the inverse of tbswapin. It tears down the physical
state on the testbed, freeing the resources for other use. It clears state on the testbed, freeing the resources for other use. It clears
the physical state from the DB but leaves the virtual state intact. I.e. the physical state from the DB but leaves the virtual state intact. I.e.
it reverse tbswapin but not tbprerun. it reverse tbswapin but not tbprerun.
-nologfile - Prevents creation/appending of a logfile.
-force - Does not check current experiment state. -force - Does not check current experiment state.
---------------------------------------------------------------------- ----------------------------------------------------------------------
...@@ -71,12 +67,11 @@ it reverse tbswapin but not tbprerun. ...@@ -71,12 +67,11 @@ it reverse tbswapin but not tbprerun.
tbend tbend
Syntax: Syntax:
tbend [-nologfile] [-force] <pid> <eid> tbend [-force] <pid> <eid>
tbend is the inverse of tbprerun. It clears the virtual state from tbend is the inverse of tbprerun. It clears the virtual state from
the DB and marks the experiment as ended. the DB and marks the experiment as ended.
-nologfile - Prevents creation/appending of a logfile.
-force - Does not check current experiment state. -force - Does not check current experiment state.
---------------------------------------------------------------------- ----------------------------------------------------------------------
......
...@@ -14,7 +14,6 @@ sub usage() ...@@ -14,7 +14,6 @@ sub usage()
# Configure variables # Configure variables
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $TESTMODE = "@TESTMODE@";
# #
# Testbed Support libraries # Testbed Support libraries
......
...@@ -17,7 +17,7 @@ use Fcntl ':flock'; ...@@ -17,7 +17,7 @@ use Fcntl ':flock';
# #
my $TB = "@prefix@"; my $TB = "@prefix@";
my $TBOPS = "@TBOPSEMAIL@"; my $TBOPS = "@TBOPSEMAIL@";
my $TESTMODE = "@TESTMODE@"; my $TESTMODE = @TESTMODE@;
# Note no -n option. We redirect stdin from the new exports file below. # Note no -n option. We redirect stdin from the new exports file below.
my $SSH = "$TB/bin/sshtb -l root fs.emulab.net"; my $SSH = "$TB/bin/sshtb -l root fs.emulab.net";
......
...@@ -26,7 +26,7 @@ my $optlist = ""; ...@@ -26,7 +26,7 @@ my $optlist = "";
my $TB = "@prefix@"; my $TB = "@prefix@";
my $DBNAME = "@TBDBNAME@"; my $DBNAME = "@TBDBNAME@";
my $TBOPS = "@TBOPSEMAIL@"; my $TBOPS = "@TBOPSEMAIL@";
my $TESTMODE = "@TESTMODE@"; my $TESTMODE = @TESTMODE@;
my $TFTP = "/tftpboot"; my $TFTP = "/tftpboot";
# #
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
my $TB; my $TB;
my $DBNAME = "@TBDBNAME@"; my $DBNAME = "@TBDBNAME@";
my $TESTMODE = "@TESTMODE@"; my $TESTMODE = @TESTMODE@;
BEGIN { BEGIN {
$TB = "@prefix@"; $TB = "@prefix@";
......
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