Commit 094db2ba authored by Robert Ricci's avatar Robert Ricci
Browse files

Fix and off-by-one error in the $MAX_CHILDREN code.

parent 2cb6b386
...@@ -263,7 +263,7 @@ while (1) { ...@@ -263,7 +263,7 @@ while (1) {
# #
# There are more free slots # There are more free slots
# #
if (($children < $MAX_CHILDREN) && @vnodes) { if (($children <= $MAX_CHILDREN) && @vnodes) {
# #
# Look for a vnode that is not on a pnode we're already working on # Look for a vnode that is not on a pnode we're already working on
# #
...@@ -377,12 +377,9 @@ while (1) { ...@@ -377,12 +377,9 @@ while (1) {
elsif ($exitstatus == 15) { elsif ($exitstatus == 15) {
print STDERR "$vnode is wedged.\n" if $debug; print STDERR "$vnode is wedged.\n" if $debug;
} }
# Send mail to testbed-ops about it
SENDMAIL($TBOPS, "Virtual Node $vnode $mode failure",
"Virtual node $vnode $mode (on physical node $pnode) in pid/eid\n".
"$pid/$eid has failed! Exit status was $exitstatus.\n");
push @failed_nodes, [$vnode, $pnode, $mode, $exitstatus];
if (!$killmode) { if (!$killmode) {
warn("*** $0:\n". warn("*** $0:\n".
" Virtual node $vnode setup failure!\n"); " Virtual node $vnode setup failure!\n");
...@@ -402,6 +399,17 @@ while (1) { ...@@ -402,6 +399,17 @@ while (1) {
} }
} }
#
# Send mail to testbed-ops about failed nodes
#
if (@failed_nodes) {
my $failed_lines = join("\n",map { join("\t",@{$_}) } @failed_nodes);
SENDMAIL($TBOPS, "Virtual Node failure for $pid/$eid",
"The following virtual nodes failed: \n" .
"vnode\t\tpnode\t\tmode\texit status\n" .
$failed_lines);
}
if ($killmode) { if ($killmode) {
print STDOUT "Vnode teardown finished.\n"; print STDOUT "Vnode teardown finished.\n";
} }
......
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