Commit 2f44b953 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Fix up the code to move failed plab nodes into hwdown, which was

getting confused by canfail code.
parent 68ffe2ce
......@@ -723,6 +723,18 @@ elsif (@vnodelist) {
}
print "*** WARNING: $node did not boot!\n";
if ($plabvnodes{$node}) {
#
# We move the pnode into hwdown so that it will not be considered
# again, until the plab monitor daemon determines that it is
# really working again.
#
MarkPhysNodeDown($pnode);
TBSetNodeLogEntry($pnode, $dbuid, TB_DEFAULT_NODELOGTYPE(),
"'Moved to hwdown; ".
"$node ($pid/$eid) failed to setup'");
}
if ($canfail{$node}) {
# Send mail to testbed-ops and to the user about it.
......@@ -745,15 +757,6 @@ elsif (@vnodelist) {
next;
}
if ($plabvnodes{$node}) {
#
# We move the pnode into hwdown so that it will not be considered
# again, until the plab monitor daemon determines that it is
# really working again.
#
MarkPhysNodeDown($pnode);
TBSetNodeLogEntry($pnode, $dbuid, TB_DEFAULT_NODELOGTYPE(),
"'Moved to hwdown; ".
"$node ($pid/$eid) failed to setup'");
$failedplab++;
}
else {
......
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