Commit c5c937b8 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Couple of small changes resulting from Portal based scaling tests:

1. Do not run the prerender in big experiments. Sucks up a CPU for 15
   minutes, just for a jpeg image on the classic interface, that no one
   is looking at.

2. Do not run vtopgen; this takes a long time too, and since we
   immediately run the mapper right after, why bother. A small change to
   mapper will make sure the node counts are set even in alloconly mode,
   since thats the only reason we run vtopgen in the first place.
parent 0f4ebb79
......@@ -2909,8 +2909,11 @@ sub GetTicketAuxAux($$$$$$$$$$$)
#print STDERR $output;
# Do a render cause its nice to have on the show experiment page.
system("$PRERENDER -r $pid $eid");
system("$PRERENDER -t $pid $eid");
# But skip for really big topos, too much overhead.
if (scalar(keys(%nodemap)) <= 500) {
system("$PRERENDER -r $pid $eid");
system("$PRERENDER -t $pid $eid");
}
#
# Now run the mapper in impotent mode. The idea is get a solution
......@@ -2919,6 +2922,7 @@ sub GetTicketAuxAux($$$$$$$$$$$)
#
my $tmpfile = tmpnam();
if (0) {
DebugTimeStamp("Starting vtopgen");
# First a prerun to get the node counts and verify topo.
$output = GeniUtil::ExecQuiet("$VTOPGEN -p $pid $eid");
......@@ -2930,6 +2934,7 @@ sub GetTicketAuxAux($$$$$$$$$$$)
goto bad;
}
DebugTimeStamp("Finished vtopgen");
}
$slice_experiment->CleanLogFiles();
#
......
......@@ -698,7 +698,7 @@ sub RunAssign($$)
return 0
if ($toponly);
if (! ($impotent || $regression || $alloconly)) {
if (! ($impotent || $regression)) {
if ($experiment->Update({"maximum_nodes" => $vtop->maximum_nodes(),
"minimum_nodes" => $vtop->minimum_nodes(),
"virtnode_count"=> $vtop->virtnodecount() })){
......
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