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

Fix up the maxrun checking code in the assign loop, which I broke in

previous revision.

Bump maxrun for plab experiments from 1 to 2 (special case predated my
changes).
parent 88f300d6
......@@ -428,7 +428,7 @@ my $canceled = 0;
# XXX plab hack - only run assign once on plab topologies, since they're easy
# to map and the physical topology does not change frequently.
if ($plabcount && (keys(%virt_nodes) == $plabcount)) {
$maxrun = 1;
$maxrun = 2;
}
TBDebugTimeStamp("assign_loop started");
......@@ -455,16 +455,15 @@ while (1) {
last
if ($retval == 0);
if ($currentrun >= $maxrun) {
fatal($exitcode, "Reached run limit. Giving up.");
}
if ($retval < 0) {
#
# Failure in assign.
#
if ($currentrun >= $maxrun) {
fatal($exitcode,
"Reached run limit. Giving up.");
}
fatal($exitcode,
"Unretriable error. Giving up.");
fatal($exitcode, "Unretriable error. Giving up.");
}
print "Waiting 5 seconds and trying again...\n";
sleep(5);
......
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