Commit 428a4c5e authored by Leigh Stoller's avatar Leigh Stoller

Minor tweaks for jailed nodes. Nothing to brag about.

parent 11ffe50a
......@@ -972,7 +972,8 @@ foreach my $vname (keys(%isvirtnode)) {
# Try to allocate. Note, if this fails we are done for. Okay for now
# since it is never the case that it should fail given the current
# requirement that all local vnodes are "fixed" to a real node.
#
#
print "Reserving $pnode (for $vname) ...\n";
if (system("nalloc $pid $eid $pnode")) {
die("*** $0:\n".
"Failed to reserve $pnode (on $fixed)\n");
......
......@@ -214,7 +214,7 @@ foreach my $node (@nodes) {
#
my $sb = stat($imagepath);
my $chunks = $sb->size / (1024 * 1024);
$maxwait = int((($chunks / 100.0) * 25) + (4 * 60));
$maxwait = int((($chunks / 100.0) * 30) + (5 * 60));
# 0 means load the entire disk.
my $diskpart = "";
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -80,7 +80,7 @@ sub cleanup {
# we just kill off the vnode stuff.
#
TBDebugTimeStamp("vnode_setup -k started");
if (system("vnode_setup -f -d -k $pid $eid")) {
if (system("vnode_setup -d -k $pid $eid")) {
print STDERR "*** Failed tear down vnodes.\n";
}
......
......@@ -122,9 +122,6 @@ if (!TBAdmin($UID) &&
" You do not have permission to mess with $pid/$eid!\n");
}
# Need the state.
$exptstate = ExpState($pid, $eid);
#
# Get the list of nodes.
#
......@@ -154,8 +151,10 @@ foreach my $node (@nodes) {
# no need to do anything. Ditto for swapping out; the vnode
# will get torn down when the node goes down, obviously.
#
if (($killmode && ExpState($pid, $eid) eq EXPTSTATE_SWAPPING) ||
(!$killmode && ExpState($pid, $eid) eq EXPTSTATE_ACTIVATING)) {
my $exptstate = ExpState($pid, $eid);
if ($exptstate eq EXPTSTATE_SWAPPING ||
$exptstate eq EXPTSTATE_ACTIVATING) {
print STDOUT "Skipping $mode of vnode $node on local $pnode ...\n";
next;
}
......
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