Commit 76dd54cd authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Add timestamp calls.

parent 689f471b
......@@ -128,6 +128,8 @@ sub doaction($@)
next
if (!-x "$BINDIR/rc/$script");
TBDebugTimeStamp("running $BINDIR/rc/$script");
print "Running $BINDIR/rc/$script\n"
if ($debug);
......
......@@ -114,27 +114,32 @@ sub doboot()
# Yuck! We need the eventkey in the outer environment so that agents
# can get it.
TBDebugTimeStamp("ifsetup running $KEYCONFIG");
if (defined($vnodeid)) {
system("$KEYCONFIG -j $vnodeid boot");
}
# Routes will be done when the interfaces go up, but must set
# things up and do generic boot.
TBDebugTimeStamp("ifsetup running $ROUTECONFIG");
system("$ROUTECONFIG $optarg boot");
if ($?) {
fatal("Could not boot routing!");
}
TBDebugTimeStamp("ifsetup running $TUNCONFIG");
system("$TUNCONFIG $optarg boot");
if ($?) {
fatal("Could not boot tunnels!");
}
TBDebugTimeStamp("ifsetup running $IFCONFIG");
system("$IFCONFIG $optarg boot");
if ($?) {
fatal("Could not boot interfaces!");
}
TBDebugTimeStamp("ifsetup running $DELAYCONFIG");
system("$DELAYCONFIG $optarg boot");
if ($?) {
fatal("Could not boot delays!");
......
......@@ -82,6 +82,8 @@ exit(0);
#
sub doboot()
{
TBDebugTimeStamp("rc.injail starting up");
print("Checking Testbed reservation status\n");
my ($pid, $eid, $vname) = jailsetup();
......@@ -99,6 +101,7 @@ sub doboot()
# setup to proceed in parallel (okay, at most two are going to partially
# overlap, but that is better then nothing at all!
#
TBDebugTimeStamp("rc.injail starting watchdog");
if (-x "$BINDIR/watchdog") {
print("Starting testbed watchdog daemon\n");
system("$BINDIR/watchdog start");
......@@ -111,11 +114,13 @@ sub doboot()
# This is where we run all of the config scripts. These talk to the
# DB and setup the node the way it is supposed to be.
#
TBDebugTimeStamp("rc.injail running config scripts");
print("Running config scripts\n");
system("$RCDIR/rc.config boot");
if ($?) {
fatal("Error running $RCDIR/rc.config");
}
TBDebugTimeStamp("rc.injail done running config scripts");
print("Informing the testbed that we are up and running\n");
if (tmcc(TMCCCMD_STATE, "ISUP") < 0) {
......
Supports Markdown
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