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

Minor Protogeni cooked mode change; delete all slivers on swapout.

parent d0b403f7
...@@ -45,6 +45,7 @@ my $piper = "$TBROOT/sbin/locpiper"; ...@@ -45,6 +45,7 @@ my $piper = "$TBROOT/sbin/locpiper";
my $mapper = "$TBROOT/bin/mapper"; my $mapper = "$TBROOT/bin/mapper";
my $wrapper = "$TBROOT/libexec/assign_wrapper"; my $wrapper = "$TBROOT/libexec/assign_wrapper";
my $NFSTRACESUPPORT= @NFSTRACESUPPORT@; my $NFSTRACESUPPORT= @NFSTRACESUPPORT@;
my $PGENISUPPORT = @PROTOGENI_SUPPORT@;
# Untaint the path # Untaint the path
$ENV{'PATH'} = "/usr/bin:$TBROOT/libexec:$TBROOT/libexec/ns2ir" . $ENV{'PATH'} = "/usr/bin:$TBROOT/libexec:$TBROOT/libexec/ns2ir" .
...@@ -64,8 +65,9 @@ use Experiment; ...@@ -64,8 +65,9 @@ use Experiment;
use User; use User;
use Lan; use Lan;
use Firewall; use Firewall;
if ($PGENISUPPORT) {
#require exitonwarn; # exitonwarn isn't really a module, so just require it require libGeni;
}
# #
# Actual swap-in and swap-out functions, defined below. # Actual swap-in and swap-out functions, defined below.
...@@ -645,6 +647,16 @@ sub doSwapout($) { ...@@ -645,6 +647,16 @@ sub doSwapout($) {
return 1; return 1;
} }
#
# Clear away Geni slivers. Do not proceed if this fails.
#
if ($PGENISUPPORT) {
if (libGeni::DeleteAllSlivers($experiment, $this_user)) {
tberror("Could not delete slivers\n");
return 1;
}
}
# #
# remove all nodes from the experiment. # remove all nodes from the experiment.
# (nfree will send them to RES_FREE_DIRTY) # (nfree will send them to RES_FREE_DIRTY)
......
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